Commit graph

2874 commits

Author SHA1 Message Date
unknown
d765c17530 ndb - bug#20892
Correction of bug#19852 (that also revealed another bug)
  Do grow noOfPagesToGrow with more than was actually allocated


ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Dont grow "noOfPagesToGrow" with more than was actually allocated
    (as it will then grow indefinitly)
2006-08-03 14:46:11 +02:00
unknown
fe2b9a8f76 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-03 14:02:39 +02:00
unknown
42fd7e8f7d ndb - bug#20892
Fix bug in tup buddy allocator, which made it make invalid access to cfreepagelist[16] (which is not defined)


ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  loop from firstListToCheck -1 (as firstListToCheck has already been checked), when looking for less than requested pages
  add if-statement for firtListToCheck == 0
2006-08-03 14:01:37 +02:00
unknown
2f8bc2141e Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/test/ndbapi/testIndex.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
2006-08-01 17:06:02 +02:00
unknown
eb94c0c9f2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-08-01 17:04:29 +02:00
unknown
2f710b2d69 ndb - fix error message
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix printout
2006-08-01 17:03:17 +02:00
unknown
0752f2d52b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/41-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-08-01 16:56:57 +02:00
unknown
e80d95a7d6 ndb - bug#21384
handle error in TCKEYREQ during TCINDXREQ better


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add 3 values to isIndexOp
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle error in TCKEYREQ during TCINDXREQ
ndb/test/ndbapi/testIndex.cpp:
  Add testcase
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase
2006-08-01 16:55:41 +02:00
unknown
a3ac499a5a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-08-01 16:26:22 +02:00
unknown
8509c31abb Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-08-01 16:25:48 +02:00
unknown
dc50ce9970 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/time.cc:
  Auto merged
2006-07-18 23:45:17 +04:00
unknown
6067045823 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461
2006-07-15 21:54:47 +02:00
unknown
8f5681c919 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
2006-07-15 21:44:25 +02:00
unknown
728fbb3ab5 fix for a compatibility build problem on MacOSX intel.
Discussed with Kent.


ndb/test/ndbapi/Makefile.am:
  Fix for a compatibility build problem on MacOSX Intel.
2006-07-14 12:09:36 +03:00
unknown
27721ce53f ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x")
ndb/src/kernel/error/TimeModule.cpp:
  0=Sunday
2006-07-11 17:07:23 +02:00
unknown
66fc547d1b Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-07-10 14:12:02 +02:00
unknown
001c7f5fe1 ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam)
ndb/src/kernel/blocks/dbdict/DictLock.txt:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.cpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.hpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/test/run-test/daily-basic-tests.txt:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
2006-07-10 13:59:13 +02:00
unknown
f98f5d639b ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam)
ndb/include/kernel/GlobalSignalNumbers.h:
  5.0 : add NODE_START_REP from 5.1
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.hpp:
  5.0 : add NODE_START_REP from 5.1
2006-07-10 13:44:15 +02:00
unknown
ce3f15beb5 ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0)
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  non-debug compile fix
2006-07-10 12:13:45 +02:00
unknown
665db1a6ad ndb - bug#20847: non-debug compile fix
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  non-debug compile fix
2006-07-10 12:05:51 +02:00
unknown
9be463262b Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my41
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-bug20847
2006-07-10 11:06:21 +02:00
unknown
32e99ab123 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
2006-07-10 11:02:46 +02:00
unknown
bd720c4d9b Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
2006-07-07 16:05:10 +02:00
unknown
31e3e75304 ndb - bug#20904
Reset logpartstate if file_change_problem after writeing of zero page is done
2006-07-07 16:01:35 +02:00
unknown
8de29d3a77 Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847
into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847


BitKeeper/etc/config:
  auto
ndb/src/kernel/blocks/ERROR_codes.txt:
  manual
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  SCCS merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  SCCS merged
ndb/test/ndbapi/testDict.cpp:
  SCCS merged
ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
sql/opt_range.cc:
  SCCS merged
2006-07-07 13:40:47 +02:00
unknown
2c48aaa183 ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/ERROR_codes.txt:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/test/ndbapi/testDict.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/test/run-test/daily-basic-tests.txt:
  DbtupTabDesMan: add merge with left buddies
2006-07-07 10:57:22 +02:00
unknown
99e347b154 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-06 19:03:33 +02:00
unknown
ce554d56a4 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02:00
unknown
337310a96c Merge jonas@perch:src/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-07-06 16:06:19 +02:00
unknown
af3f5c9e37 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-06 16:03:01 +02:00
unknown
c66b8fccf0 ndb - bug#20860
Better error message when failing to read either of 2 DIH schema files


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Better error message when failing to read either of 2 DIH schema files
2006-07-06 15:51:35 +02:00
unknown
3e9758bc23 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-07-06 15:23:35 +02:00
unknown
73bf763071 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-07-06 15:22:25 +02:00
unknown
123c0a98b4 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/ndbapi/DictCache.cpp:
  Auto merged
2006-07-06 15:20:22 +02:00
unknown
7997d847f2 backport of ndb DictCache fix
- don't invalidate tables that are in state RETRIEVING
2006-07-06 15:18:00 +02:00
unknown
54f3f0263e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged
2006-07-06 09:47:59 +02:00
unknown
d2eeb79edb Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-07-06 09:41:25 +02:00
unknown
0890735c7a ndb - revert bug fix for bug#20442 2006-07-06 09:38:18 +02:00
unknown
623f8beec0 ndbd: added missing jamEntry(); 2006-07-05 20:24:12 +02:00
unknown
051f3892c3 Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
- updated error message to more correctly reflect the issue
2006-07-05 20:20:39 +02:00
unknown
4d71b8f8f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-05 16:40:24 +02:00
unknown
7a8c451655 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-07-05 16:34:34 +02:00
unknown
53ed06f270 Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
- remove some event code to get rid of some bugs
2006-07-05 16:26:08 +02:00
unknown
95e37a4ad5 ndb - ps_7ndb as discovered by pb
fix race in scan close


ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix race in scan close
2006-07-04 16:54:07 +02:00
unknown
99e4dee4ff ndb - bug#20847 fix (4.1)
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  DROP did not do merge with right buddies
2006-07-04 15:11:11 +02:00
unknown
250ea729a4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-06-30 11:25:37 +02:00
unknown
4354d94045 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-30 11:25:14 +02:00
unknown
79bb70355f Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-06-30 09:42:15 +02:00
unknown
652a02f6e1 ndb - bug#20774
crash if system restart with more than 4096 fragments
  solution: continueb enable expand check loop


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  continueb enable expand check loop
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  continueb enable expand check loop
2006-06-30 09:41:41 +02:00
unknown
79f5a97fb9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2006-06-29 16:34:25 +02:00