Commit graph

1670 commits

Author SHA1 Message Date
lzhou/zhl@dev3-63.(none)
be4db4993b BUG#26307 correct inconsistant jam() and ljam() use in DBTUP source files. 2007-03-02 18:45:09 +00:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2248cd3d3e bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected
when merge from 5.0 to 5.1, update a function call in testScanFilter.cpp 
beacuase the function's definition is changed from 5.0 to 5.1
2007-03-02 11:03:16 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
e1a90408db bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected,
add a new file in 5.0 and rename it in 5.1 because the directory of ndb is changed from 5.0 to 5.1
2007-03-02 09:41:47 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2dc3fbf925 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj
2007-03-01 17:43:14 +08:00
gni/root@dev3-221.dev.cn.tlan
8b4e1a2f3d Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378
2007-02-15 17:51:18 +08:00
gni/root@dev3-221.dev.cn.tlan
7751f965da Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715
2007-02-15 17:20:05 +08:00
gni/root@dev3-221.dev.cn.tlan
d2a0c95aef Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2007-02-15 16:27:21 +08:00
gni/root@dev3-221.dev.cn.tlan
525801e31b Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug24363
2007-02-15 13:44:01 +08:00
tomas@poseidon.mysql.com
9545bef37d Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-09 20:31:52 +07:00
tomas@poseidon.mysql.com
18f63370aa Bug #24000 ndb_config.cpp has the wrong name ndb_condig.cpp in source distro 2007-02-08 13:40:05 +07:00
mskold/marty@linux.site
8dd443f986 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 11:44:41 +01:00
mskold/marty@linux.site
fd0232b226 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-07 11:40:43 +01:00
mskold/marty@linux.site
5d35ff3da1 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 09:37:18 +01:00
mskold/marty@linux.site
270fd100b7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-07 09:32:34 +01:00
mskold/marty@linux.site
6aee9eedf7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-06 23:48:53 +01:00
mskold/marty@linux.site
b13e5b8ee9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-06 23:42:24 +01:00
gni/root@dev3-221.dev.cn.tlan
3f5cac54c2 BUG#19378 Job Buffer Full error appears for too large MaxNoOfTables 2007-02-06 20:00:00 +08:00
tomas@poseidon.mysql.com
3fc4f75ec7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-06 15:00:19 +07:00
tomas@poseidon.mysql.com
54bd795f12 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-06 12:45:42 +07:00
tomas@poseidon.mysql.com
a8f0edea67 ndb: remove WAITFOR_RESPONSE_TIMEOUT printout
- to get cleaner error log in debug mode
2007-02-06 11:57:56 +07:00
jonas@perch.ndb.mysql.com
9364181baf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-05 21:50:39 +01:00
jonas@eel.(none)
3edab3e4c8 ndb - some more hugo abort option fix 2007-02-05 21:38:16 +01:00
jonas@eel.(none)
35bfea9466 ndb -
Add abort option to lots of Hugo code, 
as it assumes it and default value has changed
2007-02-05 20:28:11 +01:00
jonas@eel.(none)
8619dfc222 ndb - bug#25801
- improve error message if starting wo/ enough REDO
  - decrease likelyhood of trying to start too early
2007-02-05 19:47:19 +01:00
lzhou/zhl@dev3-63.(none)
6039446293 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug21296-5.1.12
2007-02-05 15:44:59 +00:00
svoj@june.mysql.com
4a6770e06e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-02-05 15:31:20 +04:00
gni/root@dev3-221.dev.cn.tlan
53f7d72a5b BUG#24363 If the table structure has been changed, the default action about the restore will fail.
You can skip the table structure check with --skip-table-check (-s) option.
2007-02-05 16:48:08 +08:00
tomas@poseidon.mysql.com
aad58e2613 corrected merge error 2007-02-05 12:51:45 +07:00
tomas@poseidon.mysql.com
3c265e5944 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-05 12:19:24 +07:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
jonas@eel.(none)
ef38f9b780 ndb - bug#25984 - more than 7 failed node restart can cause cluster failure
new behaviour is as follows:
1) node is refused to start, and should fail with message in error log that it must be restarted --initial
2) if cluster failure in this situation, node must also be restarted --intial
   if not SR will fail, with this message
2007-02-02 17:07:15 +01:00
jonas@eel.(none)
9f69d9ffde Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  eel.(none):/home/jonas/src/51-work
2007-02-02 16:21:42 +01:00
jonas@eel.(none)
4b965407d2 ndb - test prg
fix failure during start
2007-02-02 16:14:48 +01:00
tomas@poseidon.mysql.com
36a674b2eb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-02 21:04:02 +07:00
tomas@poseidon.mysql.com
d45e1e4e67 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-02 21:01:34 +07:00
lzhou/zhl@dev3-63.(none)
224900565c Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb
2007-02-01 17:34:20 +00:00
lzhou/zhl@dev3-63.(none)
956636767e BUG#22025 Return correct error message when transporter error occured. Modify content of message structure of last patch. 2007-02-01 14:37:43 +00:00
istruewing@chilla.local
54bf789a6d Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 15:15:40 +01:00
stewart@willster.(none)
71097eff45 BUG#23571 missing jamEntry() after EXECUTE_DIRECT in lqh
add the jamEntry()
2007-02-01 17:19:19 +11:00
brian@zim.(none)
acd1201504 Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 2007-01-31 20:13:17 -08:00
svoj@june.mysql.com
b6f39522de Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.1-engines
2007-01-31 18:57:54 +04:00
tomas@poseidon.mysql.com
1ce3dc9636 Bug#25239 Out of memory problem can cause crash in SUMA 2007-01-31 13:01:03 +07:00
jonas@perch.ndb.mysql.com
0a32761857 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-30 19:45:44 +01:00
jonas@perch.ndb.mysql.com
08d5217056 ndb - interface change of handling of abort option
1) move AbortOption from NdbTransaction to NdbOperation

2) let each operation have a "default" abort option dependant on
   operation type

   - read - AO_IgnoreError
   - dml - AbortOnError
   - scan take over - AbortOnError

3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.

   Another value to execute(AO) is equivalent to setting AO on each operation before calling execute

4) execute() does _only_ return -1 if transaction has been aborted
   otherwise, you need to check each operation for error code
2007-01-30 19:45:14 +01:00
jonas@perch.ndb.mysql.com
60d263b92d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-30 19:34:49 +01:00
jonas@perch.ndb.mysql.com
4ffcd999de Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-30 19:33:33 +01:00
jonas@perch.ndb.mysql.com
7d54ea6b49 ndb -
remove copy/paste method in NdbIndexOperation
2007-01-30 19:28:32 +01:00
jonas@perch.ndb.mysql.com
3a3ed75655 ndb - minor style fixes 2007-01-30 19:26:40 +01:00
tomas@poseidon.mysql.com
2ef4c0a2c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-30 23:10:14 +07:00
tomas@poseidon.mysql.com
bfb0614175 valgrind leak
- no injected events if operation is not connected
- remove extra valgrind checks
2007-01-30 15:43:55 +07:00