Commits · f0e5987061b33864ffb4170591ed23dce8aa91ff · nexedi / MariaDB

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

ndb - Fix disk scan (backup) · 14634a49

unknown authored Oct 08, 2007

  (introduced by only updating extent pages after pageout)


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Fix disk scan (backup)

14634a49

ndb - remove extra ; · f401993d

unknown authored Oct 08, 2007

  (in test framework)


storage/ndb/test/src/NDBT_Thread.cpp:
  remove extra ;

f401993d

ndb - bug#31257 · e53ffccb

unknown authored Oct 08, 2007

    handle partially complete LCP better in SR


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove partially complete LCP from "node" when doign removeNodeFromTable
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove partially complete LCP from "node" when doign removeNodeFromTable

e53ffccb

ndb - bug#30975 (recommit to 51-telco-gca) · b3222660

unknown authored Oct 08, 2007

    - only update extent pages *after* flush of real page has been done
    - sync both create/drop of table into undolog (for disk tables)


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  inform TUP which LCP to restore each fragment to
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  1) inform TUP which LCP to restore each fragment to
  2) inform TUP both before/after a page has been written
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  1) inform TUP which LCP to restore each fragment to
  2) inform TUP both before/after a page has been written
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  log both create/drop table
storage/ndb/src/kernel/blocks/lgman.cpp:
  let TUP know about all LCPs
storage/ndb/src/kernel/blocks/pgman.cpp:
  add "when" argument to disk_page_unmap_callback so that TUP gets informed both before and after page writeout
    so that extent pages can be updated only *after* page has been written
storage/ndb/src/kernel/blocks/tsman.cpp:
  remove lsn from update page free bits
  use wal for page vs extent relation
storage/ndb/src/kernel/blocks/tsman.hpp:
  remove lsn from update page free bits
  use wal for page vs extent relation

b3222660

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

unknown authored Oct 08, 2007

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


storage/ndb/src/cw/cpcd/APIService.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

b02cd14f

ndb - Set usable timeout for atrt · 8625e942

unknown authored Oct 08, 2007

  (problem introduced by stew's timeout handling)


storage/ndb/src/cw/cpcd/APIService.cpp:
  Set usable timeout for atrt

8625e942

ndb - fix bug in old test prg(s) · b86c7308

unknown authored Oct 08, 2007

  fix SR1 and SR2


storage/ndb/test/ndbapi/testSystemRestart.cpp:
  fix SR1 and SR2

b86c7308

04 Oct, 2007 3 commits

ndb - wl#29390 post-merge 5.0 to 5.1 · b465fa96
unknown authored Oct 04, 2007
```
storage/ndb/src/ndbapi/ndberror.c:
  wl#29390 post-merge 5.0 to 5.1
```
b465fa96

Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb · a4d767cb

unknown authored Oct 04, 2007

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390


sql/ha_ndbcluster_cond.cc:
  Auto merged
mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanFilter.hpp:
  Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  ul, add code (4294) in post-merge
storage/ndb/include/ndbapi/Ndb.hpp:
  SCCS merged

a4d767cb

ndb - bug#29390: if ScanFilter is too large, abort or optionally discard it · d0d6fb96

unknown authored Oct 04, 2007


mysql-test/r/ndb_condition_pushdown.result:
  if ScanFilter is too large, abort or optionaly discard it
mysql-test/t/ndb_condition_pushdown.test:
  if ScanFilter is too large, abort or optionaly discard it
ndb/include/kernel/signaldata/ScanTab.hpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/Ndb.hpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/NdbScanFilter.hpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/ndbapi_limits.h:
  if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/NdbScanFilter.cpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/NdbScanOperation.cpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/ndberror.c:
  if ScanFilter is too large, abort or optionaly discard it
sql/ha_ndbcluster_cond.cc:
  if ScanFilter is too large, abort or optionaly discard it

d0d6fb96

03 Oct, 2007 5 commits

[PATCH] BUG#29509 ndb_mgm help needs to list the -a option for DN restart · 06058869

unknown authored Oct 03, 2007

Index: ndb/storage/ndb/src/mgmclient/CommandInterpreter.cpp
===================================================================


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  BUG#29509 ndb_mgm help needs to list the -a option for DN restart

06058869

[PATCH] BUG#25064 make formatting of key=value consistent in getTextTransReportCounters · 2c139b34

unknown authored Oct 03, 2007

Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
===================================================================


storage/ndb/src/common/debugger/EventLogger.cpp:
  BUG#25064 make formatting of key=value consistent in getTextTransReportCounters

2c139b34

[PATCH] BUG#25064 Remove newlines from cluster log · 0114d06c

unknown authored Oct 03, 2007

Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
===================================================================


storage/ndb/src/common/debugger/EventLogger.cpp:
  BUG#25064 Remove newlines from cluster log

0114d06c

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge · 7327bccd

unknown authored Oct 03, 2007

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

7327bccd

[PATCH] BUG#29565 managment server can log entries multiple times after mgmd restart · 085eac75

unknown authored Oct 03, 2007

Close the event log on shutdown of mgmd (in stopEventLog())

Index: ndb-work/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================


ndb/src/mgmsrv/MgmtSrvr.cpp:
  BUG#29565 managment server can log entries multiple times after mgmd restart

085eac75

02 Oct, 2007 3 commits
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · c8f12739
  unknown authored Oct 02, 2007
```
into  mysql.com:/usr/clones/mysql-5.1-new-ndb


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
```
  c8f12739
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 0c468819
  unknown authored Oct 02, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  0c468819
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22 · 17c48b64
  unknown authored Oct 02, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/log_event.cc:
  Auto merged
```
  17c48b64