Commits · eb69f86f04f9dd015c3e079ba5260f9997370a3d · nexedi / MariaDB

25 Apr, 2007 22 commits

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

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

eb69f86f

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

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

18d803c7

ndb - · f760e188

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

f760e188

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


storage/ndb/test/tools/Makefile.am:
  merge
```
e8145b5b
After-merge fixes. · 83f7cc3a
unknown authored Apr 25, 2007

83f7cc3a

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

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.

36fc84cf

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

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

unknown authored Apr 25, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged

51bcab99

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

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

5cb91641

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


sql/ha_ndbcluster.cc:
  Auto merged
```
eced4dd0
ndb: added some retry sleep to not get busy loops · 8eb42d72
unknown authored Apr 25, 2007

8eb42d72
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 22ec74b8
unknown authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


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

fc91b9dc

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

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

8bd0f2aa

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

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.

091f211d

Merge bk-internal:/home/bk/mysql-5.1-new-ndb · 08ee2175

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

08ee2175

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

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

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

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.

a0e82938

thread_registry.cc: · 9f910533

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

9f910533

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

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.

de4a5648

24 Apr, 2007 18 commits

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

Bug #24228 ndb_size.pl requires non-standard HTML::Template module · ea337095

unknown authored Apr 24, 2007

Bug #24227  	ndb_size.pl should report default values instead of < default for config params
Bug #24229  	ndb_size.pl doesn't compute Index usage correctly

Big ndb_size.pl update


BitKeeper/deleted/.del-ndb_size.tmpl:
  Delete: storage/ndb/tools/ndb_size.tmpl
storage/ndb/tools/Makefile.am:
  ndb_size.tmpl no longer required
storage/ndb/tools/ndb_size.pl:
  total revamp.
  
  remove use of template, improve functionality.

ea337095

- Resolved conflict between fixes for bugs 25141 and 26074. · 02d9e105

unknown authored Apr 24, 2007

- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test


mysql-test/r/windows.result:
  - Removed duplicate results.
mysql-test/t/windows.test:
  - Removed InnoDB requirement. 
  - Removed duplicate test case.
sql/ha_partition.cc:
  - Reverted changes from bug 26074 because it conflicts with bug 25141.

02d9e105

- Removing mistake. · 44e831f7

unknown authored Apr 24, 2007


BitKeeper/deleted/.del-partition.inc:
  Delete: mysql-test/include/partition.inc

44e831f7

Cset exclude: iggy@alf.|ChangeSet|20070330021852|19466 · ab5e11c2

unknown authored Apr 24, 2007


BitKeeper/deleted/.del-partition_not_windows.test:
  Exclude
BitKeeper/deleted/.del-partition_windows.result:
  Exclude
BitKeeper/deleted/.del-partition_windows.test:
  Exclude
mysql-test/include/partition.inc:
  Exclude
sql/sql_table.cc:
  Exclude

ab5e11c2

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


sql/ha_ndbcluster.cc:
  Auto merged
```
4b5ded0f
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint · 954aec8f
unknown authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


BitKeeper/etc/ignore:
  auto-union
```
954aec8f
Merge alf.:D:/src/mysql-5.1-maint · f667dd85
unknown authored Apr 24, 2007
```
into  alf.:D:/src/mysql-5.1-maint_pt
```
f667dd85

Minor fixes. · d3ffc5e3

unknown authored Apr 24, 2007


scripts/CMakeLists.txt:
  Fix broken bk native builds.
sql/log_event_old.cc:
  Fix for failing DBUG builds.

d3ffc5e3

Added missing backslash · df085d30
unknown authored Apr 24, 2007

df085d30

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

unknown authored Apr 24, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

a8133ffa

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · ad53a382
unknown authored Apr 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.h:
  Auto merged
```
ad53a382

ha_ndbcluster.h, ha_ndbcluster.cc: · e4198bd9

unknown authored Apr 24, 2007

  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
  Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
  Merge


libmysqld/Makefile.am:
  Added compilation of ha_ndbcluster_cond
sql/Makefile.am:
  Added compilation of ha_ndbcluster_cond
sql/ha_ndbcluster.cc:
  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster.h:
  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster_cond.cc:
  Merge
sql/ha_ndbcluster_cond.h:
  Merge

e4198bd9

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 5d93925c

unknown authored Apr 24, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/Makefile.am:
  Manual merge

5d93925c

Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118 · 6af9e0c4

unknown authored Apr 24, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged

6af9e0c4

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 2e2ff84a

unknown authored Apr 24, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

2e2ff84a

Merge bk-internal:/home/bk/mysql-5.0-maint · a38c055e
unknown authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
a38c055e