mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50668 commits 2793 branches 343 tags 1.7 GiB
Commit graph

1630 commits

Author SHA1 Message Date
unknown
8a976f5abe 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-07-04 22:45:24 +02:00
unknown
2088eae27f 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/dblqh/DblqhMain.cpp:
  Auto merged
 2007-07-04 22:41:41 +02:00
unknown
a3cd95eef8 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2007-07-04 22:40:39 +02:00
unknown
1b84121688 backport compute hash 2007-07-04 20:16:42 +02:00
unknown
ae417134e9 Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug25941


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Print warning message to stderr instead of stdout
 2007-07-04 16:32:26 +00:00
unknown
0ec2c73da5 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/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
 2007-07-03 16:37:15 +02:00
unknown
ac84ebf684 ndb - bug#28642 - Tablespace returning incorrect usage status 
make free 64 bit (as it represents free bytes, not free extents as originally designed)


storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  make free 64 bit (as it represents free bytes, not free extents as originally designed)
 2007-07-03 16:29:25 +02:00
unknown
e678159013 ndb - bug#25901 
handle undofile/logfile groups that were created while node was node


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure that START_RECREQ is run on lgman/tsman even during initial node restart
storage/ndb/src/kernel/blocks/lgman.cpp:
  Set state to LG_STARTING during node/system restart
storage/ndb/src/kernel/blocks/lgman.hpp:
  add new state
 2007-07-03 14:12:27 +02:00
unknown
48782e344c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
 2007-07-03 13:10:07 +02:00
unknown
b5a6100132 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/dblqh/DblqhMain.cpp:
  Auto merged
 2007-07-03 08:41:52 +02:00
unknown
fb349433aa Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2007-07-03 08:41:05 +02:00
unknown
766525d9dc 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/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
 2007-07-02 14:08:22 +02:00
unknown
0095218a01 ndb - bug#29364 - port merge (5.0 -> 5.1) 2007-07-02 13:59:17 +02:00
unknown
0b4041f311 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
 2007-07-02 13:54:27 +02:00
unknown
575bb5add2 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-rpl


mysql-test/r/rpl_ndb_stm_innodb.result:
  Auto merged
mysql-test/t/rpl_ndb_stm_innodb.test:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
 2007-06-28 07:08:37 +02:00
unknown
3a621bbc45 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/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
 2007-06-26 15:42:50 +02:00
unknown
b367a80e23 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-06-26 15:20:19 +02:00
unknown
b4199e9106 ndb - bug#29331 (51) 
Add better handling of GCP Stop
    Only kill "offending" node


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  add new error codes
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add better GCP stop handling
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add better GCP stop handling
 2007-06-26 15:19:42 +02:00
unknown
830b7579f1 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51-gca 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug29176
 2007-06-25 09:16:43 +02:00
unknown
56c68a4731 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/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2007-06-25 07:18:00 +02:00
unknown
ea88a770ea Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-06-25 07:14:21 +02:00
unknown
5201c499d2 ndb - post merge 50/51 - bug#29057 bug#29067 and bug#29118 
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  post merge
 2007-06-25 07:12:27 +02:00
unknown
baa4324b36 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
 2007-06-25 07:09:53 +02:00
unknown
8cafb450fb ndb - bug#29176 pgman: another missing stack pruning related to drop table 
storage/ndb/src/kernel/blocks/pgman.cpp:
  another missing pgman stack pruning related to drop_page
 2007-06-24 22:14:09 +02:00
unknown
98a0b45213 updated for bug#28770 2007-06-22 17:05:14 +02:00
unknown
461a4a8334 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


sql/ha_ndbcluster_cond.h:
  Auto merged
 2007-06-20 06:26:23 +02:00
unknown
e258e2340b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-20 05:46:36 +02:00
unknown
6b25b945b1 Bug #29229 memory corruption in dbtup 2007-06-20 05:41:54 +02:00
unknown
511ef0cc29 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Auto merged
mysql-test/t/rpl_ndb_bank.test:
  Auto merged
mysql-test/t/rpl_ndb_basic.test:
  Auto merged
mysql-test/t/rpl_ndb_do_table.test:
  Auto merged
mysql-test/t/rpl_ndb_idempotent.test:
  Auto merged
mysql-test/t/rpl_ndb_stm_innodb.test:
  Auto merged
mysql-test/t/rpl_ndb_sync.test:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
mysql-test/include/have_multi_ndb.inc:
  manual merge
mysql-test/include/have_ndb.inc:
  manual merge
mysql-test/t/rpl_ndb_commit_afterflush.test:
  manual merge
mysql-test/t/rpl_ndb_ddl.test:
  manual merge
mysql-test/t/rpl_ndb_innodb_trans.test:
  manual merge
 2007-06-18 23:55:48 +02:00
unknown
ea8934c505 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/pgman.cpp:
  Auto merged
 2007-06-18 23:49:30 +02:00
unknown
ccb8da8239 ndb - bug#29176 missing stack pruning in drop_page 
storage/ndb/src/kernel/blocks/pgman.cpp:
  missing stack pruning in drop_page
 2007-06-18 16:03:41 +02:00
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
8f7696d266 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines


extra/perror.c:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
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/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
 2007-06-17 17:21:27 +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
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
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
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