Commits · 6825b79b41f47e862a17c22d4450b3ce4cdde2af · Kirill Smelkov / mariadb

25 Oct, 2007 3 commits

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

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

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

.del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba: · 15c04ead

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

15c04ead

rpl_bug31076.test, rpl_bug31076.result: · 1f3caac2

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

1f3caac2

09 Oct, 2007 8 commits

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

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

de4cce52

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

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

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

ae9d9eaa

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

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

b9b14911

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

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

unknown authored Oct 09, 2007

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


storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged

8d371191

ndb - testSystemRestart -n SR_UNDO · 33bd12e1

unknown authored Oct 09, 2007

  yet another test prg bug


storage/ndb/test/ndbapi/testSystemRestart.cpp:
  yet another test prg bug

33bd12e1

Bug #31470 ndb table with special characters in name are not discovered correctly · deb74591
unknown authored Oct 09, 2007

deb74591

08 Oct, 2007 3 commits

ndb - post merge fixes · a586bb61

unknown authored Oct 08, 2007


storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  merge

a586bb61

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

unknown authored Oct 08, 2007

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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  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/DbtupDiskAlloc.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/test/src/NDBT_Thread.cpp:
  Auto merged

1c8547f2

ndb - fix dd drop table race condition · 16f5fec2

unknown authored Oct 08, 2007

  add list of pages being unmaped, so we can wait for it to be empty before dropping extents


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add list of pages being unmaped
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  add list of pages being unmaped
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  wait for unmap pages

16f5fec2