Commits · 7e37e0158e9c18be0e9a0aba3800ff50283c72fd · nexedi / MariaDB

26 Apr, 2007 12 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 7e37e015

unknown authored Apr 26, 2007

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


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

7e37e015

BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted · 021a2519

unknown authored Apr 26, 2007

storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
When running nodes return AllocNodeIdRef::NodeFailureHandlingNotCompleted error during applying the node id for restarting nodes, it should try again.
storage/ndb/src/ndbapi/ndberror.c:
change AllocNodeIdRef::NodeFailureHandlingNotCompleted error from permanent error to temporary error

021a2519

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · aff77118
unknown authored Apr 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
aff77118
correction of result file · 4bd99ef3
unknown authored Apr 26, 2007

4bd99ef3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 291c619d
unknown authored Apr 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
291c619d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 45f4dfe7
unknown authored Apr 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
45f4dfe7
remove compiler warning · 7e42f6b4
unknown authored Apr 26, 2007

7e42f6b4

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

unknown authored Apr 26, 2007

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


storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge

da719b3d

Bug #27205 Occational 899 if delete+insert during LCP · 10d2d900
unknown authored Apr 26, 2007
```
- put page of deleted row last in list
```
10d2d900

WL#1190 preparatory work needed for compatability with future online add column · 3854e643

unknown authored Apr 26, 2007


sql/ha_ndbcluster.cc:
  WL#1190 preparatory work needed for compatability with future online add column
  - make forcing of var part reference into ndb storage default, may be overridden by table setting ROW_FORMAT=FIXED
mysql-test/r/ndb_row_format.result:
  New BitKeeper file ``mysql-test/r/ndb_row_format.result''
mysql-test/t/ndb_row_format.test:
  New BitKeeper file ``mysql-test/t/ndb_row_format.test''

3854e643

Bug #24667 After ALTER TABLE operation ndb_dd table becomes regular ndb · b2ca0304
unknown authored Apr 26, 2007

b2ca0304
ndb: force varpart part I, allow setting of flag in dictionary · 6932b4d7
unknown authored Apr 26, 2007

6932b4d7

25 Apr, 2007 27 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 9eb496da

unknown authored Apr 25, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

9eb496da

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

unknown authored Apr 25, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/test/tools/Makefile.am:
  merge

55403ffb

Add --symbolic-links=1 for partition_not_windows-master.opt. · 42f70eb7

unknown authored Apr 25, 2007


mysql-test/t/partition_not_windows-master.opt:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/partition_not_windows-master.opt
mysql-test/t/partition_not_windows.test:
  Tweak comments to be more meaningful

42f70eb7

ndb - · 59978185

unknown authored Apr 25, 2007

clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end

59978185

Merge bk-internal:/home/bk/mysql-5.1-telco-gca · a8fef668

unknown authored Apr 25, 2007

into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


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/ndbapi/testBasic.cpp:
  SCCS merged

a8fef668

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 58e28f65
unknown authored Apr 25, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
58e28f65
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 · 4573d034
unknown authored Apr 25, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
4573d034

Fix for valgrind errors in test: require symlink support for partition_not_windows.test · 47c0b4ca

unknown authored Apr 25, 2007


mysql-test/include/have_symlink.inc:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/include/have_symlink.inc

47c0b4ca

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 7f48dfa0
unknown authored Apr 25, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/test/tools/Makefile.am:
  merge
```
7f48dfa0
After-merge fixes. · b6c30e12
unknown authored Apr 25, 2007

b6c30e12

Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca · f488c925

unknown authored Apr 25, 2007

into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.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/include/ndbapi/NdbTransaction.hpp:
  Manual merge.
storage/ndb/test/ndbapi/testBasic.cpp:
  Manual merge.
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Manual merge.

f488c925

Merge bk-internal:/home/bk/mysql-5.1-new-ndb · e291f4dd
unknown authored Apr 25, 2007
```
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
```
e291f4dd

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

unknown authored Apr 25, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged

ebaf7707

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 7716cf2c

unknown authored Apr 25, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

7716cf2c

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 868a229c
unknown authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  Auto merged
```
868a229c
ndb: added some retry sleep to not get busy loops · 0443044e
unknown authored Apr 25, 2007

0443044e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 9a9ff150
unknown authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  SCCS merged
```
9a9ff150
Bug #28093 ndb: retry sleep in get table stats 30s instead of 30ms · 10b5227b
unknown authored Apr 25, 2007

10b5227b

Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca-bug28073 · 88a10dba

unknown authored Apr 25, 2007

into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

88a10dba

Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca · 4ea948c5

unknown authored Apr 25, 2007

into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Manual merge.

4ea948c5

Merge bk-internal:/home/bk/mysql-5.1-new-ndb · 830feaf4

unknown authored Apr 25, 2007

into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

830feaf4

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 13547d83
unknown authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
13547d83
After-merge fixes. · dd92e293
unknown authored Apr 25, 2007

dd92e293
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint · a959459c
unknown authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
a959459c

BUG#28073: Infinite loop in lock queue. · ca532914

unknown authored Apr 25, 2007

In a certain code path the NDBD could loop infinitely in the lock queue.


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix infinite loop.
storage/ndb/test/include/HugoOperations.hpp:
  Add optional hinting of TC for new transactions.
storage/ndb/test/ndbapi/testBasic.cpp:
  Add test case.
storage/ndb/test/run-test/daily-basic-tests.txt:
  Add test case.
storage/ndb/test/src/HugoOperations.cpp:
  Add optional hinting of TC for new transactions.

ca532914

thread_registry.cc: · 604c12b4

unknown authored Apr 25, 2007

Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed

server-tools/instance-manager/thread_registry.cc:
Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed

604c12b4

BUG#27495: Missing implementation of NdbTransaction::executeAsynch(). · 2399e1c9

unknown authored Apr 25, 2007

NdbTransaction::executeAsynch() was not implemented. Add implementation.


ndb/include/ndbapi/NdbTransaction.hpp:
  executeAsynch() should probably allow setting forceSend.
ndb/src/ndbapi/NdbTransaction.cpp:
  Add missing implementation of executeAsynch().
ndb/test/ndbapi/testNdbApi.cpp:
  Add test case.
ndb/test/run-test/daily-basic-tests.txt:
  Add new test.

2399e1c9

24 Apr, 2007 1 commit
- Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · f90fc071
  unknown authored Apr 24, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
```
  f90fc071