Commits · 7974dbbb986baebcee99818c0f731a8a7a9e5705 · nexedi / MariaDB

26 Oct, 2007 2 commits

correct unused code · 7974dbbb
unknown authored Oct 26, 2007

7974dbbb

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

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''

c67a88fa

25 Oct, 2007 7 commits

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

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.

bc166c30

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


sql/ha_ndbcluster.cc:
  Auto merged
```
809ef8a7

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

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

88b41549

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

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.

fe3ddd41

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

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

e631fd54

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

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.

43aced65

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

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.

750ae98f

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

ndb - bug#26450 · a4d77573

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

a4d77573

19 Oct, 2007 1 commit

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

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

5bd8722f

18 Oct, 2007 1 commit

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

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

793c9493

15 Oct, 2007 4 commits

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

unknown authored Oct 15, 2007

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


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

e82f007c

ndb - reenable disabled testcases · 9d0ca582

unknown authored Oct 15, 2007

  ndb_load
  ndb_dd_sql_features


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

9d0ca582

ndb - bug#31482 · bdfca2e6

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

bdfca2e6

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

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


storage/ndb/test/ndbapi/testScan.cpp:
  fix testcase
```
  4b0fe442
- Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 41944e2f
  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
```
  41944e2f
- Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug29390 · bc07a817
  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
```
  bc07a817
- ndb - bug#29390: fix mem leak introduced in previous cset · 4eef3e9c
  unknown authored Oct 14, 2007
```
ndb/src/ndbapi/NdbScanFilter.cpp:
  fix mem leak on discarded scanfilter
```
  4eef3e9c
12 Oct, 2007 4 commits

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

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

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

Fixed header to reflect the implementation. · baba40c5

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.

baba40c5

11 Oct, 2007 4 commits

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

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

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

70dcad7b

ndb - · f3ef7762

unknown authored Oct 11, 2007

  decrease test time


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

f3ef7762

ndb - bug#31525 · 2d9aecd3

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

2d9aecd3

10 Oct, 2007 3 commits

rpl_ndb_extraColMaster.test, rpl_ndb_extraColMaster.result: · 147567b3

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

147567b3

.del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba: · e9de43c2

unknown authored Oct 10, 2007

  Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
  Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
  Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
Many files:
  merged and cleanup of test cases


BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
  Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba:
  Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
  Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  merged and cleanup of test cases
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  merged and cleanup of test cases
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test:
  merged and cleanup of test cases
mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test:
  merged and cleanup of test cases
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  merged and cleanup of test cases

e9de43c2

rpl_bug31076.test, rpl_bug31076.result: · 45523344

unknown authored Oct 10, 2007

  Correcting test bug


mysql-test/suite/rpl/r/rpl_bug31076.result:
  Correcting test bug
mysql-test/suite/rpl/t/rpl_bug31076.test:
  Correcting test bug

45523344

09 Oct, 2007 5 commits

Updated NDB test to run for both RBR and MBR testing. In addition added test... · d4dc8aa5

unknown authored Oct 09, 2007

Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests.


mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test:
  Updated test to run for both row and mixed replication testing
mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result:
  Updated results file
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Updated test to specify the engine in the create. In addition had to add BIG SQL for NDB
mysql-test/suite/rpl/r/rpl_row_charset.result:
  Updated results file
mysql-test/suite/rpl/t/rpl_row_charset_innodb.test:
  Created a wrapper to test innodb storage engine as well
mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt:
  Option file to ensure innodb on master
mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt:
  Option file to ensure innodb on slave
mysql-test/suite/rpl/r/rpl_row_charset_innodb.result:
  New results file for innodb test case

d4dc8aa5

Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 6cf17088
unknown authored Oct 09, 2007
```
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
```
6cf17088

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

unknown authored Oct 09, 2007

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


storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged

328d1748

ndb - more test prg fixes (due to small change in scanUpdates impl.) · 7676ce52

unknown authored Oct 09, 2007

  (autotest tests)


storage/ndb/test/ndbapi/testDict.cpp:
  more test prg fixes
storage/ndb/test/ndbapi/testIndex.cpp:
  more test prg fixes
storage/ndb/test/ndbapi/test_event.cpp:
  more test prg fixes

7676ce52

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