Commits · ee88bc63d0dbf5fdedef4bf8170731b5abcabf18 · nexedi / MariaDB

23 Mar, 2007 8 commits

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

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

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

82ccba94

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

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

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

686c5d8d

correction of merge · cd4be332
unknown authored Mar 23, 2007

cd4be332

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

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

bfc21b77

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

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

7be0377a

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

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

c6969c18

22 Mar, 2007 22 commits

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

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

974702c6

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

3fcd48ff

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

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

2e986bcc

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

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

8f785c5e

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

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

0a0e2697

Bug #27320 ndb handler does not reset extra flags on reset() · f216c398
unknown authored Mar 22, 2007
```
- make sure all extra flags are reset
```
f216c398
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 74ef4a53
unknown authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
74ef4a53

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 890b9cce

unknown authored Mar 22, 2007

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


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

890b9cce

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 92329549

unknown authored Mar 22, 2007

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


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

92329549

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

unknown authored Mar 22, 2007

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


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

8b05892d

ndb - · 9f8dc4e0

unknown authored Mar 22, 2007

  fix testprg


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  fix testprg

9f8dc4e0

ndb - fix test prg · 5ad23735
unknown authored Mar 22, 2007

5ad23735
Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7c1b5d87
unknown authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
7c1b5d87

ndb - · 3ad18a30

unknown authored Mar 22, 2007

  fix test prg


ndb/test/ndbapi/testNodeRestart.cpp:
  fix test prg

3ad18a30

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

unknown authored Mar 22, 2007

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


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

977d6c76

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f66b2278
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
f66b2278

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4fd148b4

unknown authored Mar 22, 2007

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


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

4fd148b4

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 400337ad
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
400337ad
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f274b5b
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
7f274b5b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · b2af7b90
unknown authored Mar 22, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
b2af7b90

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · cd7f48b7

unknown authored Mar 22, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/help.result:
  Auto merged
mysql-test/t/help.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

cd7f48b7

21 Mar, 2007 10 commits
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · b22f62a4
  unknown authored Mar 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  b22f62a4
- Update the result file with an updated comment. · 0aed5c8b
  unknown authored Mar 22, 2007
  
  0aed5c8b
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 6e8fd718
  unknown authored Mar 22, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  6e8fd718
- Try to fix events_logs_tests race on Windows. · ddc644f4
  unknown authored Mar 22, 2007
```
mysql-test/t/events_logs_tests.test:
  Try to fix a race condition that breaks this test on Windows.
```
  ddc644f4
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 7e6fd07c
  unknown authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  7e6fd07c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5351224e
  unknown authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  5351224e
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · de72e4c1
  unknown authored Mar 21, 2007
```
into  recycle.(none):/src/bug27144/my50-bug27144
```
  de72e4c1
- Merge recycle.(none):/src/bug27144/my50-bug27144 · e5c91b02
  unknown authored Mar 21, 2007
```
into  recycle.(none):/src/bug27144/my51-bug27144


mysql-test/t/sp-destruct.test:
  SCCS merged
```
  e5c91b02
- Bug#27144 sp-destruct.test is disabled on Windows · 1e28904b
  unknown authored Mar 21, 2007
```
- Update test to run properly on Windows.


mysql-test/t/sp-destruct.test:
  Bug#27144 sp-destruct.test is disabled on Windows
  - Enabled test on Windows.
  - Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo) 
  with the mysqltest builtin commands.
  - Replace Windows directory seperator in error ER_NOT_FROM_FILE with
  posix directory seperator for single test/result pair.
```
  1e28904b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4f10e5bf
  unknown authored Mar 21, 2007
```
into  recycle.(none):/src/bug23736/my50-bug23736
```
  4f10e5bf