Commits · 92776c352f37b6c6696ac5ffc258b85fb574ad3f · nexedi / MariaDB

29 Mar, 2007 4 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 92776c35

unknown authored Mar 29, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged

92776c35

Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory · a7bd98dc
unknown authored Mar 29, 2007
```
- also run this patch on 32 bit machines to allow online upgrade
```
a7bd98dc

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · bdc85c2d

unknown authored Mar 29, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.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/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  Auto merged

bdc85c2d

Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory · 5d976eb0

unknown authored Mar 29, 2007

- increase var part reference from 32 to 64 bits on 64 bit systems
- note current patch does not allow for online upgrade from 32 to 64 bit systems or vice versa

5d976eb0

28 Mar, 2007 1 commit
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 621cfce1
  unknown authored Mar 28, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  621cfce1
27 Mar, 2007 10 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3812f992
unknown authored Mar 27, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
3812f992

ndb - · 6208d93f

unknown authored Mar 27, 2007

  remove compiler warning/error


storage/ndb/test/ndbapi/testScanFilter.cpp:
  remove compiler warning/error

6208d93f

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

unknown authored Mar 27, 2007

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

05a0da08

ndb - · d0bcc0a7

unknown authored Mar 27, 2007

  reformat code a bit to be more compiler friendly


storage/ndb/test/src/NdbRestarts.cpp:
  more verbosity

d0bcc0a7

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

unknown authored Mar 27, 2007

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

2bc2ba05

ndb - · 554f47eb

unknown authored Mar 27, 2007

  remove compiler warning from last changeset


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove compiler warning from last changeset

554f47eb

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

unknown authored Mar 27, 2007

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
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/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge

4bd9a562

ndb - bug#27466 nf during nr can leave cluster in inconsistent state (recommit in 5.1) · 8b1bae26

unknown authored Mar 27, 2007

    Fix race condition between NODE_FAILREP and local INCL_NODEREQ loop
    Also retry on ZNODE_START_DISALLOWED_ERROR



storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  Move error code
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Move error code
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      1) retry also on ZNODE_START_DISALLOWED_ERROR
      2) Change if() else in INCL_NODECONF to for-loop instead
      3) (last but not least) fix bug, that could cause different block withing same node to have different opinion about node status
         solution is to check if node is still alive before sening next local INCL_NODEREQ
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
      Add error insert to allow node to die during INCL_NODEREQ
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
      1) let suma be well behaved (i.e reply to INCL_NODEREQ)
      2) Add dump to print c_connceted_nodes/c_subscriber_nodes (8010)
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  new testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  new testcase

8b1bae26

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 5d567b7b

unknown authored Mar 27, 2007

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


mysql-test/t/query_cache_sql_prepare.test:
  Auto merged

5d567b7b

Bug #27444 DataMemory missing from report in cluster logs · bd0d1a57
unknown authored Mar 27, 2007
```
- error in initial signal length giving uninitialized variable
```
bd0d1a57

26 Mar, 2007 14 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · eee07612
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
eee07612
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2ac8412c
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
2ac8412c
correction of manual merge · 71f01705
unknown authored Mar 26, 2007

71f01705
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2a53eb21
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
2a53eb21

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 6c6bf612

unknown authored Mar 26, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge

6c6bf612

correct medium int printout · 92492c82

unknown authored Mar 26, 2007

    correct cit printout
    correct bit store retrieve


ndb/include/ndbapi/NdbRecAttr.hpp:
  correct medium int printout
ndb/src/ndbapi/NdbRecAttr.cpp:
  correct cit printout
sql/ha_ndbcluster.cc:
  correct bit store retrieve

92492c82

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 90f04172
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
90f04172
Bug #26986 BIT(33) for ndb is broken on solaris. · 8ebefce4
unknown authored Mar 26, 2007
```
- always store lsw first in ndb
```
8ebefce4
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb · 3d02a5cb
unknown authored Mar 26, 2007
```
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
```
3d02a5cb
remove warning · 240dc268
unknown authored Mar 26, 2007

240dc268

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · cfb56e5e

unknown authored Mar 26, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

cfb56e5e

Merge mysqldev@production.mysql.com:my/mysql-5.1-release · 9029645d

unknown authored Mar 26, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-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/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

9029645d

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · b2db93ed

unknown authored Mar 26, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/tools/restore/Restore.cpp:
  manual merge

b2db93ed

Bug #26900 ndb_restore printout option does not give structured data · 8ec4d143
unknown authored Mar 26, 2007
```
- set sizes for data
```
8ec4d143

25 Mar, 2007 3 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 71b453cd

unknown authored Mar 25, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

71b453cd

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · ef8786ff
unknown authored Mar 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
```
ef8786ff

Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 5043b31e

unknown authored Mar 25, 2007

into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged

5043b31e

23 Mar, 2007 8 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 46955de0

unknown authored Mar 23, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/util/OutputStream.hpp:
  Auto merged

46955de0

rpl_ndb_sync.result, ndb_partition_key.result: · c031bc31

unknown authored Mar 23, 2007

  test case


mysql-test/r/ndb_partition_key.result:
  test case
mysql-test/r/rpl_ndb_sync.result:
  test case

c031bc31

mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded". · f2fcb8be
unknown authored Mar 23, 2007
```
mysql-test/t/query_cache_sql_prepare.test:
  Prevent this test from running in "embedded", it needs two connections.
```
f2fcb8be
result file updates, message format changes · 1e9ecf99
unknown authored Mar 23, 2007

1e9ecf99

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user · 2cefd1f7

unknown authored Mar 23, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
mysql-test/r/ndb_single_user.result:
  manual merge
mysql-test/t/disabled.def:
  manual merge
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge

2cefd1f7

enabled and extended single user test · c2c33fac
unknown authored Mar 23, 2007

c2c33fac

BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table · 1ee2ea5c

unknown authored Mar 23, 2007


sql/ha_ndbcluster.cc:
  set single user mode on ndb schema table
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  dbug print

1ee2ea5c

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user · ee88bc63

unknown authored Mar 23, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

ee88bc63