Commits · df7ff47816b4c9107abc62eff4fa25ceb5f1e5ad · nexedi / MariaDB

12 Apr, 2007 11 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · df7ff478
unknown authored Apr 12, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
df7ff478

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 84227177

unknown authored Apr 12, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged
storage/ndb/include/kernel/AttributeHeader.hpp:
  merge
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  merge
storage/ndb/test/ndbapi/testBasic.cpp:
  merge

84227177

ndb - bug#27756 · dc8d4699

unknown authored Apr 12, 2007

  make sure that copy tuple is released in all cases


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  make sure that copy tuple is released in all cases
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase

dc8d4699

ndb - bug#27756 · ebadeef4

unknown authored Apr 12, 2007

  testcase only
  new pseudo column NDB$COPY_ROWID


storage/ndb/include/kernel/AttributeHeader.hpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/test/ndbapi/testBasic.cpp:
  add testcase for bug#27756

ebadeef4

ndb - hugo - add new method for setting primary key(s) · c3ca248b

unknown authored Apr 12, 2007


storage/ndb/test/include/HugoOperations.hpp:
  Add method for setting of primary key
storage/ndb/test/src/HugoAsynchTransactions.cpp:
  Add method for setting of primary key
storage/ndb/test/src/HugoOperations.cpp:
  Add method for setting of primary key
storage/ndb/test/src/HugoTransactions.cpp:
  Add method for setting of primary key

c3ca248b

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 4e946606
unknown authored Apr 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
4e946606

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 94f9da5e

unknown authored Apr 12, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  null merge, 5.1 already reports correct error
mysql-test/r/ndb_restore.result:
  manual merge
mysql-test/t/ndb_restore.test:
  manual merge

94f9da5e

Bug #27758 Restoring NDB backups makes table usable in SQL nodes · dfd00029

unknown authored Apr 12, 2007

- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout


mysql-test/r/ndb_restore.result:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - change to using an index with space to reproduce bug
mysql-test/t/ndb_restore.test:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - change to using an index with space to reproduce bug
ndb/tools/restore/consumer_restore.cpp:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - parse indexname using "split" instead of sscanf, as not to break at space
  - enclose names in printout
ndb/tools/restore/restore_main.cpp:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - enclose names in printout
sql/ha_ndbcluster.cc:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - correct error message

dfd00029

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 70d1fd45

unknown authored Apr 12, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/t/ndb_dd_basic.test:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged

70d1fd45

ndb - mysql-test-run testcase for bug#27757 · 4380cabe

unknown authored Apr 12, 2007


mysql-test/r/ndb_dd_basic.result:
  testcase
mysql-test/t/ndb_dd_basic.test:
  testcase

4380cabe

ndb - bug#27757 · 6c3c2ecf

unknown authored Apr 12, 2007

  tupscan misses uncommitted inserts by own transaction
    let tupkeyreq handle dirty/savepoint

  also siable diskscan as temporary fix for bug#27776


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  let tupkeyreq handle dirty/savepoint

6c3c2ecf

11 Apr, 2007 14 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 7c291173

unknown authored Apr 11, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  null merge

7c291173

remove warning · 1dd19799
unknown authored Apr 11, 2007

1dd19799
correct merge error · d06dc296
unknown authored Apr 11, 2007

d06dc296
missing return · 775e03de
unknown authored Apr 11, 2007

775e03de
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 1414c04d
unknown authored Apr 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
1414c04d

Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 · 988417ec

unknown authored Apr 11, 2007

- try to catch as many malloc failures as possible and give error messages
(more for 5.1)


storage/ndb/src/ndbapi/ObjectMap.cpp:
  Rename: ndb/src/ndbapi/ObjectMap.cpp -> storage/ndb/src/ndbapi/ObjectMap.cpp

988417ec

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

unknown authored Apr 11, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbReceiver.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbReceiver.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/include/util/BaseString.hpp:
  Auto merged
storage/ndb/src/common/util/BaseString.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/ndbapi/Ndb.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/util/Vector.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/DictCache.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/DictCache.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/Makefile.am:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/Ndb.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1

e41deaa0

Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 · 660afeae

unknown authored Apr 11, 2007

- try to catch as many malloc failures as possible and give error messages


ndb/src/ndbapi/ObjectMap.cpp:
  New BitKeeper file ``ndb/src/ndbapi/ObjectMap.cpp''

660afeae

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 93202206

unknown authored Apr 11, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged

93202206

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 2b76522e
unknown authored Apr 11, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
2b76522e

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · b313ae3b

unknown authored Apr 11, 2007

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged

b313ae3b

ndb - bug#27748 · 5ecdd6db

unknown authored Apr 11, 2007

  fix commit trigger on multi-update


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix commit trigger on multi-update

5ecdd6db

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 0afaa29f

unknown authored Apr 11, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/r/rpl_ndb_basic.result:
  Auto merged
mysql-test/t/rpl_ndb_basic.test:
  Auto merged

0afaa29f

ndb - bug#27748 · e2515ca2
unknown authored Apr 11, 2007
```
  testcase
```
e2515ca2

10 Apr, 2007 7 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · cef3fd37

unknown authored Apr 10, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/tools/Makefile.am:
  Auto merged

cef3fd37

ndb - · a7481a7a

unknown authored Apr 10, 2007

  add event log listener test tool


storage/ndb/test/tools/Makefile.am:
  add event log listener test tool
storage/ndb/test/tools/log_listner.cpp:
  New BitKeeper file ``storage/ndb/test/tools/log_listner.cpp''

a7481a7a

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 59ec33f8
unknown authored Apr 10, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
59ec33f8

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · f21b60d4

unknown authored Apr 10, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged

f21b60d4

ndb - bug#27651 (5.1) · dfbf6e7d

unknown authored Apr 10, 2007

  Only prepare "next" GCI if we're in the first 4 highest GCI's
    to avoid we can get several buckets with same GCI


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Only prepare "next" GCI if we're in the first 4 highest GCI's
        to avoid we can get several buckets with same GCI

dfbf6e7d

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · f4c7c710

unknown authored Apr 10, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

f4c7c710

ndb - bug#27728 (5.1) · 1584ee92

unknown authored Apr 10, 2007

  Make sure API is connected to nodes when subscribing


storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  new error code
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  make sure API is connected in SUB_START_REQ
storage/ndb/src/ndbapi/ndberror.c:
  new error code

1584ee92

09 Apr, 2007 5 commits

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · d202216d

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged

d202216d

Merge bk@192.168.21.1:mysql-5.0-opt · 2501c71a
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
2501c71a

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 89723d3d

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

89723d3d

Merge bk@192.168.21.1:mysql-5.1 · 4ed7139d
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/sql_table.cc:
  Auto merged
```
4ed7139d
Merge bk@192.168.21.1:mysql-5.0 · 3b7d3230
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged
```
3b7d3230

08 Apr, 2007 2 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · c407e28b

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

c407e28b

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 74c6bf3e

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

74c6bf3e

07 Apr, 2007 1 commit
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · be15f0c8
  unknown authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql


sql/sql_load.cc:
  Auto merged
```
  be15f0c8