Commits · 310f5ce53f30cdaf6707af4fcb5dbc9039997f63 · nexedi / MariaDB

15 Aug, 2007 3 commits

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · 310f5ce5

unknown authored Aug 15, 2007

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30134


storage/ndb/tools/restore/Restore.cpp:
  Auto merged

310f5ce5

Remove the extra files for the bug29674 exist only in 5.0 · 34250204

unknown authored Aug 15, 2007


BitKeeper/deleted/.del-ndb_restore_different_endian_data.result:
  Delete: mysql-test/r/ndb_restore_different_endian_data.result
BitKeeper/deleted/.del-BACKUP-1-0.1.Data:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data
BitKeeper/deleted/.del-BACKUP-1-0.2.Data:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
BitKeeper/deleted/.del-BACKUP-1.1.ctl:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl
BitKeeper/deleted/.del-BACKUP-1.1.log:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log
BitKeeper/deleted/.del-BACKUP-1.2.ctl:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl
BitKeeper/deleted/.del-BACKUP-1.2.log:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log
BitKeeper/deleted/.del-BACKUP-1-0.1.Data~a57077b1652462e:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data
BitKeeper/deleted/.del-BACKUP-1-0.2.Data~7ded385bca6b1f64:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data
BitKeeper/deleted/.del-BACKUP-1.1.ctl~f95f9b1922013c1f:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl
BitKeeper/deleted/.del-BACKUP-1.1.log~a9759ef97cd15f92:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log
BitKeeper/deleted/.del-BACKUP-1.2.ctl~3ebf846a47d4cc6c:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl
BitKeeper/deleted/.del-BACKUP-1.2.log~6c37168b3738d195:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log
BitKeeper/deleted/.del-ndb_restore_different_endian_data.test:
  Delete: mysql-test/t/ndb_restore_different_endian_data.test

34250204

Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug29674 · 953a58d1

unknown authored Aug 15, 2007

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug29674


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Revert the change in parseTableInfo for modified only in 5.0
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Revert declare of pareTableInfo for 5.1
storage/ndb/tools/restore/Restore.cpp:
  Revert change in 5.1

953a58d1

08 Aug, 2007 5 commits

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · d1542b8e
unknown authored Aug 08, 2007
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
```
d1542b8e
fix merge bug · 6fb17beb
unknown authored Aug 08, 2007

6fb17beb
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · 9ce459ce
unknown authored Aug 08, 2007
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28423
```
9ce459ce

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28423 · 4564a0d3

unknown authored Aug 08, 2007

into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28423

sql/ha_ndbcluster.cc:
make HA_ERR_FOUND_DUPP_KEY error cases throw warning like the other ambiguous engine error codes that may be caused by multiple cluster error codes.

4564a0d3

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug27683 · 6c71387a

unknown authored Aug 08, 2007

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug27683


storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

6c71387a

07 Aug, 2007 1 commit

BUG#29674 Restore/backup are endian compatible in 5.0 · 0e8ad8f3

unknown authored Aug 07, 2007


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Twiddle the "replicaCount" and "fragCount" variable when restore data from different endian.
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add byte order variable
ndb/tools/restore/Restore.cpp:
  Twiddle blob, datatime,timestamp when do restore in different endian.
mysql-test/r/ndb_restore_different_endian_data.result:
  Test case result for restore data from different endian
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log:
  Test case data
mysql-test/t/ndb_restore_different_endian_data.test:
  Test case for restore data from different endian

0e8ad8f3

31 Jul, 2007 1 commit
- BUG#30134 restore of backup from different endian can work for timestamp column · 5b05c0ca
  unknown authored Jul 31, 2007
```
storage/ndb/tools/restore/Restore.cpp:
  Convert byte order of timestamp data type
```
  5b05c0ca
30 Jul, 2007 1 commit

Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354 · 0a45af5c

unknown authored Jul 30, 2007

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

0a45af5c

25 Jul, 2007 2 commits

BUG#27683 Incorrect description for ndb_restore --print · 9cfd81dd
unknown authored Jul 25, 2007
```
ndb/tools/restore/restore_main.cpp:
  modify --print explaination of ndb_restore
```
9cfd81dd

BUG#28423 cluster to storage engine error code mapping problem · d6804c01

unknown authored Jul 25, 2007


sql/ha_ndbcluster.cc:
  make HA_ERR_FOUND_DUPP_KEY error cases throw warning like the other ambiguous engine error codes that may be caused by multiple cluster error codes

d6804c01

20 Jul, 2007 1 commit

BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. · f559ea5a

unknown authored Jul 20, 2007

         add varchar type restoring test from 5.0 backup into 5.1


mysql-test/r/ndb_restore_compat.result:
  add test result for varchar type from 5.0 version backup into 5.1
mysql-test/t/ndb_restore_compat.test:
  add test for varchar type restoring from 5.0 backup into 5.1
mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data:
  backup data
mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data:
  backup data
mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl:
  meta data of 5.0 backup
mysql-test/std_data/ndb_backup50/BACKUP-2.1.log:
  log data of 5.0 backup
mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl:
  meta data of 5.0 backup
mysql-test/std_data/ndb_backup50/BACKUP-2.2.log:
  log data of 5.0 backup

f559ea5a

06 Jul, 2007 1 commit
- update some description in t/disable.def for testcase rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb · 3385825c
  unknown authored Jul 06, 2007
```
mysql-test/t/disabled.def:
  correct related bug, bug#29549 discovers more accurate reason
```
  3385825c
04 Jul, 2007 1 commit

Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941 · b25fb195

unknown authored Jul 04, 2007

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

b25fb195

15 Jun, 2007 1 commit
- BUG#25941 Output warning messages from stdout to stderr when abitrator warnings exist · 77235fed
  unknown authored Jun 15, 2007
```
ndb/src/mgmsrv/ConfigInfo.cpp:
  Outpout warning to stderr when there are abitrator warnings
```
  77235fed
14 Jun, 2007 21 commits

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · a4699493
unknown authored Jun 14, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
a4699493
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 17d7ad93
unknown authored Jun 14, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
17d7ad93

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 85cfe25e

unknown authored Jun 14, 2007

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

85cfe25e

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 25ea9004

unknown authored Jun 14, 2007

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

25ea9004

Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed" · 81872d57
unknown authored Jun 14, 2007
```
- correction, missing node id
```
81872d57

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · cdb1f57a

unknown authored Jun 14, 2007

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

cdb1f57a

bug#29099 - slow backup for disk data · acd10b9f

unknown authored Jun 14, 2007

- 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

acd10b9f

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 75687b16

unknown authored Jun 14, 2007

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

75687b16

Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY... · c91137ee

unknown authored Jun 14, 2007

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

c91137ee

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 30809f65
unknown authored Jun 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
30809f65
correct warning · 7178ab4a
unknown authored Jun 14, 2007

7178ab4a

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 18366e3c

unknown authored Jun 14, 2007

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

18366e3c

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 0e0a691c
unknown authored Jun 14, 2007
```
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
```
0e0a691c

Bug#27640, backup id not dispalyed in the output of "ndb_mgm start backup wait completed" · d2b659d9

unknown authored Jun 14, 2007

correct related sourcecode after merge from 5.0


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  correct something to ensure only related sourcecode are merged

d2b659d9

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb · 4a24e85b

unknown authored Jun 14, 2007

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

4a24e85b

Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed" · c93e1b72

unknown authored Jun 14, 2007


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

c93e1b72

Makefile.am: · 5af60056

unknown authored Jun 14, 2007

  new public file needs to get into distribution


storage/ndb/include/Makefile.am:
  new public file needs to get into distribution

5af60056

Bug #29103 ndb_restore segfaults on NULL var[char|binary] · 0656cd2e

unknown authored Jun 14, 2007



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

0656cd2e

get mgmapi error codes into perror · 3f04dbba

unknown authored Jun 14, 2007


storage/ndb/include/mgmapi/mgmapi_error.h:
  New BitKeeper file ``storage/ndb/include/mgmapi/mgmapi_error.h''

3f04dbba

move all error codes to ndberror.c · f2e2c1ec

unknown authored Jun 14, 2007

- step 1 mgmtsrvr error codes


storage/ndb/src/mgmsrv/ndb_mgmd_error.h:
  New BitKeeper file ``storage/ndb/src/mgmsrv/ndb_mgmd_error.h''

f2e2c1ec

fix build of mgm client with history - caught by pb. · 2d06bf3b

unknown authored Jun 14, 2007


storage/ndb/src/mgmclient/main.cpp:
  fix build issues only caught by pb (mgm client history related)

2d06bf3b

13 Jun, 2007 2 commits

[PATCH] add knielsen as MAINTAINER of NDBAPI NdbRecord examples · f6c8e73c

unknown authored Jun 13, 2007

Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================


storage/ndb/MAINTAINERS:
  add knielsen as MAINTAINER of NDBAPI NdbRecord examples

f6c8e73c

[PATCH] Add MAINTAINERS file for NDB · 57dfaa78

unknown authored Jun 13, 2007

Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================


storage/ndb/MAINTAINERS:
  Add MAINTAINERS file for NDB

57dfaa78