mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
14337 commits 2779 branches 343 tags 1.6 GiB
Commit graph

14337 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
dfad106cc3 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/wl2025


ndb/src/ndbapi/NdbOperationInt.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
 2004-08-31 15:07:43 +02:00
unknown
042d620948 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-31 15:00:50 +02:00
unknown
54c1dc12f8 Update test prg 
1) merge join
2) lookups
 2004-08-31 14:53:59 +02:00
unknown
2bad0cee50 Interpreter fix + tets prg 
ndb/src/ndbapi/NdbOperationInt.cpp:
  Fix so that interpreter is possible together with index scans
ndb/test/ndbapi/Makefile.am:
  New test prog
 2004-08-31 10:14:36 +02:00
unknown
9ed92fea50 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
 2004-08-30 15:31:30 +02:00
unknown
629768d576 merge 
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
 2004-08-30 12:13:11 +02:00
unknown
89dd83db35 ndb table locks 
Removed errornous hupp, which made handler commit same transid several times
(which is checked when running in debug mode)


sql/ha_ndbcluster.cc:
  Removed errornous hupp, which made handler commit same transid several times
  (which is checked when running in debug mode)
 2004-08-30 12:13:10 +02:00
unknown
42a7e96adb see resp. file 
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  seeror set method for signal handler
ndb/src/kernel/main.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/vm/Emulator.cpp:
  adder error insert for error during shutdown
  + check for error handler invoked by signal handler
ndb/src/kernel/vm/Emulator.hpp:
  enum so signal that Shatdown is invoked by signal handler
 2004-08-30 10:13:09 +00:00
unknown
7776439c7b fixed so that error handler is only invoked once 2004-08-30 08:25:17 +00:00
unknown
4059385219 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-08-30 08:08:36 +00:00
unknown
5fac485a0e wl2025 - bug fixes 
1) Release _all_ attr bufs
2) Handle out of attr bufs


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Release _all_ attr bufs
  Handle out of attr bufs
 2004-08-29 21:35:33 +02:00
unknown
ebf4ce0501 Minor edits to error messsage. 2004-08-28 13:07:47 -05:00
unknown
8165b519e2 - adding more missing libedit files 2004-08-27 22:52:33 +02:00
unknown
5c5cf8c465 small fixes of select count(*) 
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix init
ndb/tools/select_count.cpp:
  row count is 64 bit
 2004-08-27 22:50:06 +02:00
unknown
fa5d6ac3b3 Added 3 psuedo columns 
Cleaned up code
Changed ndb_select_all


ndb/include/kernel/AttributeHeader.hpp:
  Added commit count to psuedo columns
  Added bit for psuedo columns
ndb/include/kernel/GlobalSignalNumbers.h:
  Changed into READ_PSUEDO
ndb/include/ndbapi/NdbDictionary.hpp:
  Added 3 psuedo columns
ndb/include/ndbapi/NdbOperation.hpp:
  Added 3 psuedo columns
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/ndbapi/NdbDictionary.cpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbOperation.cpp:
  Added 3 psuedo columns
ndb/tools/select_count.cpp:
  Changed select_count into using new features
 2004-08-27 22:31:16 +02:00
unknown
f0239303b9 - add missing file "read.h" to the source distribution 2004-08-27 21:18:51 +02:00
unknown
d02da1d978 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-27 19:42:04 +02:00
unknown
43acfcae1f Better handling of transaction ids, 
make *sure* that no one gets same transid twice
(wo/ restarting process)
 2004-08-27 19:41:00 +02:00
unknown
3f45e53790 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-27 19:36:54 +02:00
unknown
00a11f790a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 19:35:24 +02:00
unknown
ff136de460 Handle drop ordered index with table id > pool size 2004-08-27 19:33:46 +02:00
unknown
f1825699fa mysql.cc: 
Minor edits to help command messages.


client/mysql.cc:
  Minor edits to help command messages.
 2004-08-27 12:27:57 -05:00
unknown
6eac99a5b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 19:02:46 +02:00
unknown
d393ff72b6 Bu#4526 building with utf8_bin collation causes help to be case sensitive 2004-08-27 21:12:53 +05:00
unknown
353fb4c8d4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/Users/mikron/mysql-4.1-ndb
 2004-08-27 18:04:12 +02:00
unknown
f71662695d Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict 2004-08-27 20:48:19 +05:00
unknown
3d2e2ddd12 grant.result: 
Forgot to push in the previous changeset


mysql-test/r/grant.result:
  Forgot to push in the previous changeset
 2004-08-27 20:48:18 +05:00
unknown
7f8e7315b3 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-08-27 17:48:17 +02:00
unknown
12e10b11d9 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
 2004-08-27 20:48:16 +05:00
unknown
f4abefe36a fixed format of history of new libedit for compatibility 
with old libedit and readline

1. discarded reading and writting of hist_cookie as the begin of the file
2. skip strvis for string before saving



cmd-line-utils/libedit/history.c:
  fixed format of history for compatibility with old libedit and readline
  
  1. discarded reading and writting of hist_cookie as the begin of file
  2. skip strvis for string before saving
 2004-08-27 20:32:28 +05:00
unknown
a173bdfd3f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-27 15:37:01 +02:00
unknown
0f194e61b4 added debug to ndb test 2004-08-27 13:37:00 +00:00
unknown
aa243adb8f bug-5252 fix (tinyblob) 
ndb/src/ndbapi/NdbBlob.cpp:
  theBlobTable is NULL for tinyblob
 2004-08-27 15:10:53 +02:00
unknown
c0c6513864 Fix order by 2004-08-27 14:15:47 +02:00
unknown
fbe70897a7 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/include/ndb_global.h:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
 2004-08-27 14:11:50 +02:00
unknown
3d6675cce1 small fixes 
mysql-test/ndb/ndbcluster.sh:
  use new shutdown command
ndb/src/common/mgmcommon/Makefile.am:
  compile error fix
 2004-08-27 12:11:49 +00:00
unknown
85391d227f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 14:02:02 +02:00
unknown
47eb0b464c tux optim 14 - use pointers to cmp functions 
ndb/test/ndbapi/testOIBasic.cpp:
  null related options, not related to this changeset
 2004-08-27 13:57:51 +02:00
unknown
741070df43 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/test/ndbapi/testDict.cpp:
  Auto merged
 2004-08-27 11:49:04 +00:00
unknown
987fc11395 see respective file 
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Rename: ndb/src/common/mgmcommon/InitConfigFileParser.hpp -> ndb/src/mgmsrv/InitConfigFileParser.hpp
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Rename: ndb/src/common/mgmcommon/InitConfigFileParser.cpp -> ndb/src/mgmsrv/InitConfigFileParser.cpp
ndb/src/mgmsrv/ConfigInfo.hpp:
  Rename: ndb/src/common/mgmcommon/ConfigInfo.hpp -> ndb/src/mgmsrv/ConfigInfo.hpp
ndb/src/common/mgmcommon/Makefile.am:
  moved files to mgmsrv
ndb/src/mgmclient/CommandInterpreter.cpp:
  added shutdown command
ndb/src/mgmclient/CommandInterpreter.hpp:
  added shutdown command
ndb/src/mgmsrv/Config.cpp:
  .
ndb/src/mgmsrv/Config.hpp:
  .
ndb/src/mgmsrv/ConfigInfo.cpp:
  wait with this
ndb/src/mgmsrv/Makefile.am:
  moved files to mgmsrv
ndb/test/include/NdbBackup.hpp:
  backup not necessarily in file system path
ndb/test/ndbapi/testDict.cpp:
  compile error
ndb/test/src/NdbBackup.cpp:
  aligned with new config param
 2004-08-27 11:48:27 +00:00
unknown
0e30907761 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-08-27 15:56:27 +05:00
unknown
1ba9966b7d grant.result: 
Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.


mysql-test/r/grant.result:
  Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
 2004-08-27 15:55:16 +05:00
unknown
cbbfa20e4f Decreased chunks per fragment 
Fixed missing initialisation bug


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  4 times number of nodes is decreases worst case compared to
  8 times number of node groups
  Missing initialisation
ndb/src/kernel/vm/pc.hpp:
  Decreased chunks per fragment
 2004-08-27 11:44:39 +02:00
unknown
9fff2bdc05 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 08:54:34 +02:00
unknown
3e4ba63de1 compile ERROR!! 2004-08-27 08:25:02 +02:00
unknown
f87f890eff Adding the file needed for windows build (on behalf of Reggie) 2004-08-27 03:27:16 +04:00
unknown
cb76f3c076 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 01:01:47 +02:00
unknown
b5ebc0f259 Fix ordered index scan with partially specified key 2004-08-27 00:59:16 +02:00
unknown
6566af8c35 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
 2004-08-26 21:45:46 +00:00
unknown
1b0dee296d Do-compile: 
Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.


Build-tools/Do-compile:
  Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
 2004-08-26 16:44:01 -05:00