Commit graph

46798 commits

Author SHA1 Message Date
unknown
9b1aa63ec6 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


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2007-06-18 07:49:33 +02:00
unknown
4a0c83220a ndb - bug#29167
Fix case where all node in node group dies before they saved sysfile (wrt gcp)
  and Qmgr incorrectly thinks that "node group is missing"


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  code
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  test
storage/ndb/test/run-test/daily-basic-tests.txt:
  test
2007-06-18 07:48:59 +02:00
unknown
49c21820cb Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/r/ndb_restore.result:
  null merge
2007-06-17 22:05:33 +02:00
unknown
c982517540 correct test and result 2007-06-17 22:04:01 +02:00
unknown
f8c5e5f76c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-17 19:54:54 +02:00
unknown
1f2c0193f4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-06-17 19:50:07 +02:00
unknown
95497dcc28 Bug #28989 hpux11 ps_row warnings
- do not print 701 dictionary busy error


sql/ha_ndbcluster.cc:
  save the ndb error such that it can be traced
sql/ha_ndbcluster.h:
  save the ndb error such that it can be traced
sql/ha_ndbcluster_binlog.cc:
  use the traced ndb error to determine if it is an error that should be printed
2007-06-17 19:47:20 +02:00
unknown
7bbf39015d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/r/ndb_restore.result:
  null merge
mysql-test/t/ndb_restore.test:
  null merge
2007-06-17 19:29:15 +02:00
unknown
f2c7b62a3e BUG#27640
- correct test and result file
2007-06-17 19:27:20 +02:00
unknown
e2380b98af Bug #28949
- handler binlog's must be shutdoem before logger.cleanup_base
2007-06-16 11:16:02 +02:00
unknown
a3c2ebbcdd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 21:58:45 +02:00
unknown
d520cd0832 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-06-14 21:57:30 +02:00
unknown
cc75d9eadf Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-06-14 19:08:46 +02:00
unknown
b42f4237cd Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  manual merge
2007-06-14 19:07:29 +02:00
unknown
ec885d9caa Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
2007-06-14 18:43:29 +02:00
unknown
ebcbfef85f Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
- correction, missing node id
2007-06-14 18:40:32 +02:00
unknown
0d07520206 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 16:21:52 +02:00
unknown
d442b5a59e Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/handler.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
storage/ndb/src/ndbapi/Ndb.cpp:
  Merge
2007-06-14 16:18:40 +02:00
unknown
e59c1f5dd4 bug#29099 - slow backup for disk data
- implement read ahead during disk data scan


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  maximum read ahead
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  maximum read ahead should not be larger than page buffer size
  maximum aslo set to 32 pages
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  read ahead for disk data scan
storage/ndb/src/kernel/blocks/pgman.cpp:
  set higher max_io_waits for read ahead
  round off upwards in page_buffer size
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  add null callback to be used for read ahead (no callback needed)
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  add null callback to be used for read ahead (no callback needed)
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  remove the debug trace, not needed any more
storage/ndb/test/tools/hugoFill.cpp:
  allow setting database in hugoFill
2007-06-14 16:10:13 +02:00
unknown
d168b042a9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
2007-06-14 16:10:11 +02:00
unknown
160489138d Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb, post review fix 2007-06-14 16:01:51 +02:00
unknown
90423a375c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-14 15:39:58 +02:00
unknown
9905b81e09 correct warning 2007-06-14 15:15:45 +02:00
unknown
edb853a63b Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2007-06-14 20:45:12 +08:00
unknown
103c1eeffe Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
2007-06-14 20:30:48 +08:00
unknown
e470fbe922 Bug#27640, backup id not dispalyed in the output of "ndb_mgm start backup wait completed"
correct related sourcecode after merge from 5.0


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  correct something to ensure only related sourcecode are merged
2007-06-14 20:25:45 +08:00
unknown
6ead7eea29 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb


storage/ndb/include/debugger/EventLogger.hpp:
  Auto merged
storage/ndb/src/mgmclient/Makefile.am:
  Auto merged
2007-06-14 19:57:50 +08:00
unknown
4daad4ebfe Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed"
ndb/include/debugger/EventLogger.hpp:
  add definition for new printLogEvent() function in CommandInterpreter.cpp
ndb/src/mgmclient/CommandInterpreter.cpp:
  add a printLogEvent() function to print log event;
  filter "<PING>" by ndb_logevent_get_next() in event_thread_run();
  filter "<PING>" by ndb_logevent_get_next() in executeStartBackup();
  and make executeStartBackup() same in both 5.0 and 5.1
ndb/src/mgmclient/Makefile.am:
  add link to use ndb_logevent_get_next()
mysql-test/r/ndb_backup_print.result:
  testcase result for ndb_backup_print
  produced by mysql_test_run.pl
mysql-test/t/ndb_backup_print.test:
  add testcase for ndb_mgm -e "start backup", check outupt format
2007-06-14 19:40:44 +08:00
unknown
12d1dece30 Makefile.am:
new public file needs to get into distribution


storage/ndb/include/Makefile.am:
  new public file needs to get into distribution
2007-06-14 12:57:32 +02:00
unknown
28444ac8b1 Bug #29103 ndb_restore segfaults on NULL var[char|binary]
mysql-test/r/ndb_restore.result:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - add extra row with NULL value to test
mysql-test/t/ndb_restore.test:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - add extra row with NULL value to test
storage/ndb/tools/restore/consumer_restore.cpp:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - check that the attribute is not null
2007-06-14 12:51:13 +02:00
unknown
ef3ed50bc0 get mgmapi error codes into perror
storage/ndb/include/mgmapi/mgmapi_error.h:
  New BitKeeper file ``storage/ndb/include/mgmapi/mgmapi_error.h''
2007-06-14 12:35:35 +02:00
unknown
0d5c6b702a move all error codes to ndberror.c
- step 1 mgmtsrvr error codes


storage/ndb/src/mgmsrv/ndb_mgmd_error.h:
  New BitKeeper file ``storage/ndb/src/mgmsrv/ndb_mgmd_error.h''
2007-06-14 11:26:54 +02:00
unknown
cb9817cc23 fix build of mgm client with history - caught by pb.
storage/ndb/src/mgmclient/main.cpp:
  fix build issues only caught by pb (mgm client history related)
2007-06-14 11:59:25 +10:00
unknown
29987e6e29 [PATCH] add knielsen as MAINTAINER of NDBAPI NdbRecord examples
Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================


storage/ndb/MAINTAINERS:
  add knielsen as MAINTAINER of NDBAPI NdbRecord examples
2007-06-13 23:53:01 +10:00
unknown
f344a35fee [PATCH] Add MAINTAINERS file for NDB
Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================


storage/ndb/MAINTAINERS:
  Add MAINTAINERS file for NDB
2007-06-13 23:52:47 +10:00
unknown
42044a87ab [PATCH] BUG#29074 preserve file timestamps in ndb_error_reporter
Index: ndb-work/storage/ndb/tools/ndb_error_reporter
===================================================================


storage/ndb/tools/ndb_error_reporter:
  BUG#29074 preserve file timestamps in ndb_error_reporter
2007-06-13 23:34:36 +10:00
unknown
85525c4a54 [PATCH] Enable test for (Closed) bug 16445
Bug was updated on May 30th by Tomas to say that hasn't been seen in PB
since global dict cache rewrite. This test should probably be enabled then.

Index: ndb-work/mysql-test/t/ndb_basic.test
===================================================================


mysql-test/r/ndb_basic.result:
  Enable test for (Closed) bug 16445
mysql-test/t/ndb_basic.test:
  Enable test for (Closed) bug 16445
2007-06-13 23:34:22 +10:00
unknown
21819c2afa [PATCH] BUG#29073 Store history for ndb_mgm
Index: ndb-work/storage/ndb/src/mgmclient/main.cpp
===================================================================


storage/ndb/src/mgmclient/main.cpp:
  BUG#29073 Store history for ndb_mgm
2007-06-13 23:34:09 +10:00
unknown
1f2ce0eb48 [PATCH] Add tests for ndb variables (related to BUG#26675)
This is somewhat related to BUG#26675 (ndb_connectstring not reported
in show global variables)

Index: ndb-work/mysql-test/r/ndb_basic.result
===================================================================


mysql-test/r/ndb_basic.result:
  Add tests for ndb variables (related to BUG#26675)
mysql-test/t/ndb_basic.test:
  Add tests for ndb variables (related to BUG#26675)
2007-06-13 23:33:51 +10:00
unknown
18c6c75a35 [PATCH] Disable mysql_upgrade test (Bug#28560)
Index: ndb-work/mysql-test/t/disabled.def
===================================================================


mysql-test/t/disabled.def:
  Disable mysql_upgrade test (Bug#28560)
2007-06-13 23:33:37 +10:00
unknown
495a9490bd [PATCH] BUG#29063 mgmapi: connect timeout set incorrectly
correctly divide timeout by 1000 to convert to seconds for SocketClient

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================


storage/ndb/src/mgmapi/mgmapi.cpp:
  BUG#29063 mgmapi: connect timeout set incorrectly
2007-06-13 22:54:14 +10:00
unknown
e42de77219 [PATCH] BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
Add test to testMgm for Connect timeout. add to autotest.

Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================


storage/ndb/test/ndbapi/testMgm.cpp:
  BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
storage/ndb/test/run-test/daily-basic-tests.txt:
  BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
2007-06-13 22:54:00 +10:00
unknown
0daf97d6c9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2007-06-12 10:38:10 +02:00
unknown
805d32bd0f Bug#29044 - memory buddy allocator "unoptimal" memory handling
- add config param to have better behavior with large tables
2007-06-12 10:35:21 +02:00
unknown
98e08c79b0 extend backup dump to give more info 2007-06-12 10:06:20 +02:00
unknown
b26fa8543f Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  merge
2007-06-12 09:17:39 +02:00
unknown
1f90b253d4 ndb - bug#29044
Improve buddy high order allocation
  Make removeCommonArea O(1) instead of O(N)
  Add limit to left/right search


storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Add info to buddy module test about 
  1) loops being made in buddy
  2) how much was allocated
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  1) make removeCommonArea o(1) - as list is (after fix) double linked anyway
  2) set page_state = ZFREE_COMMON insertCommonArea and ~ZFREE_COMMON in removeCommonArea
  3) add max loops in search left/right
  4) add more debug info
2007-06-12 09:13:42 +02:00
unknown
ab0df1eb16 make function static 2007-06-11 17:50:39 +02:00
unknown
5e047ec91b change include file 2007-06-11 17:28:52 +02:00
unknown
2821723e0f internal interface to ndb (to be used by e.g. ndb_restore)
storage/ndb/src/ndbapi/ndb_internal.hpp:
  New BitKeeper file ``storage/ndb/src/ndbapi/ndb_internal.hpp''
2007-06-11 17:19:20 +02:00