Commits · b6c30e12a4a7527ef38799db39ce312bd243fcdf · nexedi / MariaDB

25 Apr, 2007 18 commits

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 22 commits

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

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

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.

2c5d704d

- Resolved conflict between fixes for bugs 25141 and 26074. · 006d9d65

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.

006d9d65

- Removing mistake. · 742c70b0

unknown authored Apr 24, 2007


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

742c70b0

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

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

551f7b1f

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


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


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

Minor fixes. · da059fcb

unknown authored Apr 24, 2007


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

da059fcb

Added missing backslash · 6e7e6077
unknown authored Apr 24, 2007

6e7e6077

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

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

794cc8d9

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


sql/ha_ndbcluster.h:
  Auto merged
```
5d60d2ee

ha_ndbcluster.h, ha_ndbcluster.cc: · be5a3426

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

be5a3426

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

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

d5ede428

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

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

f692f710

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 5018e666

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

5018e666

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

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

unknown authored Apr 24, 2007

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


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

5ceab2fe

Merge bk-internal:/home/bk/mysql-5.0-maint · 75a424ee
unknown authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
75a424ee
Moved method definition to ease merge to 5.1 · 38672eb7
unknown authored Apr 24, 2007

38672eb7
Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 · de71b107
unknown authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
```
de71b107