Commits · cdbe7302d77759c318ac42ac205712ed0dec7736 · Kirill Smelkov / mariadb

26 Mar, 2007 11 commits

correction of manual merge · cdbe7302
unknown authored Mar 26, 2007

cdbe7302

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

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

cba5f9d9

correct medium int printout · d24dab18

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

d24dab18

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 05a352bb
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
05a352bb
Bug #26986 BIT(33) for ndb is broken on solaris. · e3f3c6f0
unknown authored Mar 26, 2007
```
- always store lsw first in ndb
```
e3f3c6f0
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb · f28a7a06
unknown authored Mar 26, 2007
```
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
```
f28a7a06
remove warning · df4d3039
unknown authored Mar 26, 2007

df4d3039

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

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

0234a14e

Merge mysqldev@production.mysql.com:my/mysql-5.1-release · 73ad3195

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

73ad3195

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

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

dbe5fade

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

25 Mar, 2007 3 commits

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

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

e97d0212

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · 9f9a4556
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
```
9f9a4556

Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 2e845944

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

2e845944

23 Mar, 2007 17 commits

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

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

4d3291e6

rpl_ndb_sync.result, ndb_partition_key.result: · 27fc5de4

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

27fc5de4

result file updates, message format changes · 0c65ef99
unknown authored Mar 23, 2007

0c65ef99

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user · 14a3a61a

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

14a3a61a

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

7dc5c004

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

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

8503077e

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

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

378b47a3

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

unknown authored Mar 23, 2007

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


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

cdb16d2f

Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes · 14043656
unknown authored Mar 23, 2007
```
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  abort on timeout if in single user mode
```
14043656

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

unknown authored Mar 23, 2007

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


storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
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
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

a96a0cd6

correction of merge · cee179c1
unknown authored Mar 23, 2007

cee179c1

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · 06083cdc

unknown authored Mar 23, 2007

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


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge

06083cdc

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · 4b1ff907

unknown authored Mar 23, 2007

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


storage/ndb/include/ndbapi/NdbDictionary.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
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
storage/ndb/include/ndb_constants.h:
  manual merge
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge

4b1ff907

Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes · a80c9cce

unknown authored Mar 23, 2007


ndb/include/kernel/signaldata/DictTabInfo.hpp:
  add single user mode field in table definition
ndb/include/ndb_constants.h:
  new constants for single usermode option of tables
ndb/include/ndbapi/NdbDictionary.hpp:
  add single user mode field in table definition
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  add single user mode field in table definition
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add single user mode field in table definition
  send this infor to TC
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  add single user mode field in table definition
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  single user table mode on table object
  merge some flags from uint8 to bits
  get allow transaction to also check single user mode
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  single user table mode on table object
  merge some flags from uint8 to bits
  get allow transaction to also check single user mode
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  set single user mode flag on system tables to make them always updatable
ndb/src/ndbapi/NdbDictionary.cpp:
  get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  get/set functions for single user mode on tables
ndb/test/src/NDBT_Table.cpp:
  print single user mode

a80c9cce

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 201af2d8

unknown authored Mar 23, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


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

201af2d8

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 9fb4f3cd

unknown authored Mar 23, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

9fb4f3cd

WL#3704 mgmapi timeouts: fix compile warning · 65401f91

unknown authored Mar 23, 2007


storage/ndb/src/mgmapi/mgmapi.cpp:
  fix compile warning - signed and unsigned comparison

65401f91

22 Mar, 2007 9 commits

Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 · 0b7ba9c2

unknown authored Mar 22, 2007

into  siva.hindu.god:/home/tsmith/m/bk/maint/51


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:
  Manual merge (res.waitNodesStartPhase -> NdbSleep_SecSleep)

0b7ba9c2

Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 9875df86
unknown authored Mar 22, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
```
9875df86

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

unknown authored Mar 22, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  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/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

95b33450

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 350029d1
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
350029d1
BUG#27044 bug fix of 27320 fixes this, added test case · 9a25b5a8
unknown authored Mar 22, 2007

9a25b5a8

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

unknown authored Mar 22, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

f857ede9

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · ac3b8a79

unknown authored Mar 22, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

ac3b8a79

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 4ffad2d8

unknown authored Mar 22, 2007

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


sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge

4ffad2d8

Bug #27320 ndb handler does not reset extra flags on reset() · 22f8f391
unknown authored Mar 22, 2007
```
- make sure all extra flags are reset
```
22f8f391