Commits · 18b54358f149e13a3d71bbc237479b536345eb2f · Kirill Smelkov / mariadb

05 Nov, 2007 2 commits

Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb · 18b54358

unknown authored Nov 05, 2007

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


mysql-test/suite/ndb/r/ndb_insert.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_insert.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Using local, will merge manually
sql/ha_ndbcluster.h:
  Merge
sql/mysqld.cc:
  Merge

18b54358

ha_ndbcluster.h: · f7ee8825

unknown authored Nov 05, 2007

Bug #31956 auto increment bugs in MySQL Cluster: Added utility method and constant for internal prefetch default
ndb_auto_increment.result:
BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/r/ndb_auto_increment.result
mysqld.cc:
Bug #25176 Trying to set ndb_autoincrement_prefetch_sz always fails: Changed pointer to max value
Bug #31956 auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement)
ndb_insert.test, ndb_insert.result:
Moved auto_increment tests to ndb_auto_increment.test
ndb_auto_increment.test:
BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/t/ndb_auto_increment.test
ha_ndbcluster.cc:
Bug #31956 auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement), added handling of updates of pk/unique key with auto_increment
Bug #32055 Cluster does not handle auto inc correctly with insert ignore statement

sql/mysqld.cc:
Bug #25176 Trying to set ndb_autoincrement_prefetch_sz always fails: Changed pointer to max value
Bug #31956 auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement)
sql/ha_ndbcluster.h:
Bug #31956 auto increment bugs in MySQL Cluster: Added utility method and constant for internal prefetch default
sql/ha_ndbcluster.cc:
Bug #31956 auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement), added handling of updates of pk/unique key with auto_increment
Bug #32055 Cluster does not handle auto inc correctly with insert ignore statement
mysql-test/r/ndb_auto_increment.result:
BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/r/ndb_auto_increment.result
mysql-test/t/ndb_auto_increment.test:
BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/t/ndb_auto_increment.test
mysql-test/t/ndb_insert.test:
Moved auto_increment tests to ndb_auto_increment.test
mysql-test/r/ndb_insert.result:
Moved auto_increment tests to ndb_auto_increment.test

f7ee8825

01 Nov, 2007 4 commits
- Bug #31484 Cluster LOST_EVENTS entry not added to binlog on mysqld restart. · de0780e0
  unknown authored Nov 01, 2007
  
  de0780e0
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · c67d7e67
  unknown authored Nov 01, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
  c67d7e67
- Merge 10.102.0.1:/usr/local/mysql/mysql-5.0-ndb · 6be01f7f
  unknown authored Nov 01, 2007
```
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Null merge.
```
  6be01f7f
- Bug #31848: Test failure: Cluster has problems on insert with auto-increment · 8890b295
  unknown authored Nov 01, 2007
```
Fix uninitialized variable causing failures for some interpreted update
operations on gcc 4.2.1.


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix uninitialized variable causing failures for some interpreted update
  operations on gcc 4.2.1.
```
  8890b295
31 Oct, 2007 1 commit

Adding dbutil to ndb test lib · 2848d22d

unknown authored Oct 31, 2007


storage/ndb/test/include/dbutil.hpp:
  Hearder file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.
storage/ndb/test/src/dbutil.cpp:
  Implementation file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.
storage/ndb/test/src/Makefile.am:
  Updated to include dbutil

2848d22d

26 Oct, 2007 2 commits

correct unused code · 4ce44da3
unknown authored Oct 26, 2007

4ce44da3

commit of WL#3686 test case already in 5.1 to get regression testing, no code committed · c70da572

unknown authored Oct 26, 2007


mysql-test/suite/ndb/r/ndb_update_no_read.result:
  New BitKeeper file ``mysql-test/suite/ndb/r/ndb_update_no_read.result''
mysql-test/suite/ndb/t/ndb_update_no_read.test:
  New BitKeeper file ``mysql-test/suite/ndb/t/ndb_update_no_read.test''

c70da572

25 Oct, 2007 7 commits

Merge loke.(none):/home/knielsen/devel/mysql-5.0-ndb · 1ebb7098

unknown authored Oct 25, 2007

into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb


storage/ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge.

1ebb7098

Merge loke.(none):/home/knielsen/devel/bug31810 · e9b98a5d
unknown authored Oct 25, 2007
```
into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
e9b98a5d

Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca · 6825b79b

unknown authored Oct 25, 2007

into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb


storage/ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  SCCS merged

6825b79b

Merge loke.(none):/home/knielsen/devel/bug31761 · 29186ecd

unknown authored Oct 25, 2007

into  loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca


storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
storage/ndb/include/kernel/AttributeHeader.hpp:
  manual merge.
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  manual merge.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  manual merge.
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  manual merge.

29186ecd

Merge loke.(none):/home/knielsen/devel/bug31761 · fd1730f4

unknown authored Oct 25, 2007

into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  SCCS merged

fd1730f4

BUG#31810: Potential infinite loop with autoincrement failures in ndb · 34279339

unknown authored Oct 25, 2007

Fix extra semicolon causing if-statement to be disabled.


sql/ha_ndbcluster.cc:
  Fix extra semicolon causing if-statement to be disabled.

34279339

BUG#31761: Code for cluster is not safe for strict-alias optimization in new gcc · 07865679

unknown authored Oct 25, 2007

Fix problem with AttributeHeader::init() seen with gcc 4.2.1.

Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.


ndb/include/kernel/AttributeHeader.hpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.

07865679

24 Oct, 2007 3 commits
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · 9cae2b79
  unknown authored Oct 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  9cae2b79
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · e68fd8cd
  unknown authored Oct 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  e68fd8cd
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 3e208eb6
  unknown authored Oct 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  3e208eb6
23 Oct, 2007 1 commit

ndb - bug#26450 · c61548f1

unknown authored Oct 23, 2007

  partial backport from 6.2 + add fix of bug


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  add prep_copy_frag
storage/ndb/include/kernel/signaldata/AccScan.hpp:
  add new argument specifying which page to scan to
storage/ndb/include/kernel/signaldata/CopyFrag.hpp:
  add new argument specifying which page to scan to
storage/ndb/include/ndb_version.h.in:
  add versioning checks for prep_copy_frag
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  add prep_copy_frag
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add new to-step
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  add new to-step
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add new to-step
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  add new to-step
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  add new to-step
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add new to-step
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add new argument specifying which page to scan to
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  add utility to get max page used by fragment
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  add NR scan to > frag.noOfPages
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase
storage/ndb/test/src/NdbRestarts.cpp:
  add testcase

c61548f1

19 Oct, 2007 1 commit

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

unknown authored Oct 19, 2007

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

406e1433

18 Oct, 2007 1 commit

ndb - bug#31701 Node failure with repl. wo/ load, can lead to endless out of order buckets · 78951216

unknown authored Oct 18, 2007

  Correct check for buffer/no buffer


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  correct check for buffer/no buffer
storage/ndb/test/ndbapi/test_event.cpp:
  test prg
storage/ndb/test/run-test/daily-basic-tests.txt:
  test prg

78951216

15 Oct, 2007 4 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-simple-read · e8c4a6ba

unknown authored Oct 15, 2007

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


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged

e8c4a6ba

ndb - reenable disabled testcases · 67b31b0f

unknown authored Oct 15, 2007

  ndb_load
  ndb_dd_sql_features


mysql-test/suite/ndb/t/disabled.def:
  reenable disabled testcases

67b31b0f

ndb - bug#31482 · 007e29e2

unknown authored Oct 15, 2007

  (re)impl. simple-read (read that releases lock just before LQHKEYCONF)
  use simple-read for blobs


storage/ndb/include/kernel/signaldata/TcKeyConf.hpp:
  rename bit
storage/ndb/include/ndbapi/NdbOperation.hpp:
  add new lock-mode
storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp:
  rename bit
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  remove aggregate
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  impl. simple-read = normal read + release lock just before LQHKEYCONF
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  impl. simple-read = normal read + release lock just before LQHKEYCONF
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  impl. simple-read = normal read + release lock just before LQHKEYCONF
storage/ndb/src/ndbapi/NdbBlob.cpp:
  use simple read for blobs
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  no simple-read for ui (yet)
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  impl. simple-read
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  impl. simple-read
storage/ndb/src/ndbapi/NdbReceiver.cpp:
  impl. simple-read
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  no simple-read for scan (yet)
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  rename bit
storage/ndb/test/ndbapi/testBasic.cpp:
  add testcase for simlpe-read
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase
storage/ndb/test/src/HugoOperations.cpp:
  add simple-read

007e29e2

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 35ec70ab
unknown authored Oct 15, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
35ec70ab

14 Oct, 2007 5 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · ffef8fc6
  unknown authored Oct 14, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
```
  ffef8fc6
- ndb - testScan -n InsertDelete · 4815760b
  unknown authored Oct 14, 2007
```
fix testcase


storage/ndb/test/ndbapi/testScan.cpp:
  fix testcase
```
  4815760b
- Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 46cdd99b
  unknown authored Oct 14, 2007
```
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390


storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
```
  46cdd99b
- Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug29390 · 8a50791a
  unknown authored Oct 14, 2007
```
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390


storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
```
  8a50791a
- ndb - bug#29390: fix mem leak introduced in previous cset · eff940c7
  unknown authored Oct 14, 2007
```
ndb/src/ndbapi/NdbScanFilter.cpp:
  fix mem leak on discarded scanfilter
```
  eff940c7
12 Oct, 2007 4 commits

Fixed a typo. We have NdbTransactions not NdbTransations. · f0e59870
unknown authored Oct 12, 2007

f0e59870
Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API. · 83323285
unknown authored Oct 12, 2007

83323285
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · dbd81de4
unknown authored Oct 11, 2007
```
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-ndb
```
dbd81de4

Fixed header to reflect the implementation. · 93bf7699

unknown authored Oct 11, 2007

Added accessor method to help out the NDB/Connectors.


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Added accessor method to help out the NDB/Connectors.
storage/ndb/include/ndbapi/NdbPool.hpp:
  Fixed header to reflect the implementation.
storage/ndb/include/ndbapi/NdbScanFilter.hpp:
  Added accessor method to help out the NDB/Connectors.
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Added accessor method to help out the NDB/Connectors.
storage/ndb/src/ndbapi/NdbOperation.cpp:
  Added accessor method to help out the NDB/Connectors.
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Added accessor method to help out the NDB/Connectors.

93bf7699

11 Oct, 2007 4 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 72a432e2
unknown authored Oct 11, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
```
72a432e2

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

unknown authored Oct 11, 2007

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

f310dcc6

ndb - · 7de1ec1e

unknown authored Oct 11, 2007

  decrease test time


storage/ndb/test/run-test/daily-basic-tests.txt:
  decrease test time

7de1ec1e

ndb - bug#31525 · e54c56b2

unknown authored Oct 11, 2007

  Fix bug regarding node that missed 2 LCP's (that was not included in next LCP after SR)


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  add new error codes for bug#31525
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add new error codes for bug#31525
  fix bug, i.e include missing_2 in LCP
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#31525
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#31525

e54c56b2

10 Oct, 2007 1 commit

rpl_ndb_extraColMaster.test, rpl_ndb_extraColMaster.result: · 2510ac8c

unknown authored Oct 10, 2007

  Back porting NDB test case


mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test:
  Back porting NDB test case
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result:
  Back porting NDB test case

2510ac8c