Commits · 2d3b2458fe3deca1df1cbd713093233a8348d0f9 · Kirill Smelkov / mariadb

21 Mar, 2007 8 commits

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

unknown authored Mar 21, 2007

into  perch.ndb.mysql.com:/home/jonas/src/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

2d3b2458

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

unknown authored Mar 21, 2007

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


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

b278b210

ndb - bug#27283 · f5acedb6

unknown authored Mar 21, 2007

    Additional fix for 2-node case


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add error insert ref for errcode = 7181
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it

f5acedb6

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · fb2858bc
unknown authored Mar 21, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
fb2858bc

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

unknown authored Mar 21, 2007

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


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

1662b187

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

unknown authored Mar 21, 2007

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


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

fa30eca6

ndb - bug#27286 (5.0 version) · 34a9dd6a

unknown authored Mar 21, 2007

  make sure master is sendable


ndb/src/mgmsrv/MgmtSrvr.cpp:
  make sure master is sendable

34a9dd6a

ndb - bug#27286 · 55400a00

unknown authored Mar 21, 2007

  make sure master node is sendable, when getting ref::NotMaster 


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  make sure master node is sendable, when getting ref::NotMaster

55400a00

20 Mar, 2007 12 commits

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

unknown authored Mar 20, 2007

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


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

5e429982

enabled test case · 4890ea8a

unknown authored Mar 20, 2007

+ some fixes to do the enable


mysql-test/r/rpl_ndb_sync.result:
  enabled test case
mysql-test/t/disabled.def:
  enabled test case
sql/ha_ndbcluster.cc:
  enabled test case
sql/ha_ndbcluster_tables.h:
  add defines for old sys table
storage/ndb/tools/restore/Restore.cpp:
  add check for old sys table

4890ea8a

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

unknown authored Mar 20, 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/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

e6585a2a

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

unknown authored Mar 20, 2007

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge

d0942af8

ndb - bug#27283 (wl2325-5.0) · 26afc93a

unknown authored Mar 20, 2007

    Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

26afc93a

ndb - bug#27291 · 54edcb18

unknown authored Mar 20, 2007

  Fix correct min-value for LockPagesInMemory


ndb/src/mgmsrv/ConfigInfo.cpp:
  Fix correct min-value

54edcb18

BUG#24363 If the table structure has been changed, the default action about the restore will fail. · a842253e
unknown authored Mar 20, 2007
```
 - correction of patch, original patch will segfault for print option
```
a842253e

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

unknown authored Mar 20, 2007

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


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged

52773743

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1dd19f0c
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
1dd19f0c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 3676e864
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
3676e864
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 30e25a9e
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
30e25a9e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c2426620
unknown authored Mar 20, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/sql_insert.cc:
  Auto merged
```
c2426620

19 Mar, 2007 12 commits

sql_insert.cc: · c71bff6d

unknown authored Mar 20, 2007

  After merge fix.


sql/sql_insert.cc:
  After merge fix.

c71bff6d

Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql · ca16e703

unknown authored Mar 20, 2007

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_insert.cc:
  Manually merged.

ca16e703

sql_insert.cc: · 3798a7d5

unknown authored Mar 20, 2007

  Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.


sql/sql_insert.cc:
  Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
mysql-test/t/trigger.test:
  Corrected test case for the bug#27006.
mysql-test/r/trigger.result:
  Corrected test case for the bug#27006.

3798a7d5

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 5948a569
unknown authored Mar 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
5948a569
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 211250d2
unknown authored Mar 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
211250d2

ndb - test_event · 7856482c

unknown authored Mar 19, 2007

  Fix compile error with gcc4


storage/ndb/test/ndbapi/test_event.cpp:
  Fix compile error with gcc4

7856482c

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · a1e2f4a0
unknown authored Mar 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
a1e2f4a0

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

unknown authored Mar 19, 2007

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


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

0cdd8600

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · aace73ea
unknown authored Mar 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
aace73ea

ndb - bug#20185 · 75bd09a6

unknown authored Mar 19, 2007

  Fix race in testprg...causing random TC crashes


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  remove incorrect work-around
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Fix race in testprg...causing random TC crashes

75bd09a6

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 542c495d
unknown authored Mar 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
542c495d

ndb - autotest · fbb955d7

unknown authored Mar 19, 2007

 increase some timeouts...


storage/ndb/test/run-test/daily-devel-tests.txt:
  increase timeouts...

fbb955d7

17 Mar, 2007 2 commits

dbug/dbug.c: unused variable removed · 6bb42080

unknown authored Mar 17, 2007

include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic


dbug/dbug.c:
  unused variable removed
include/config-win.h:
  SIZEOF_INT
include/my_global.h:
  win64 fix
support-files/Makefile.am:
  automake magic

6bb42080

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 9128a807
unknown authored Mar 17, 2007
```
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


sql/sql_insert.cc:
  Auto merged
```
9128a807

16 Mar, 2007 6 commits

wl#3700 - post-review fixes: · 7d383909

unknown authored Mar 17, 2007

s/ulonglong/key_part_map/, comments


include/heap.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/my_base.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/myisam.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/myisammrg.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/event_db_repository.cc:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/ha_partition.cc:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/ha_partition.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/sql_select.h:
  wl#3700 - post-review fixes:
  remove tab_to_keypart_map()

7d383909

sql_insert.cc: · 84d24679
unknown authored Mar 16, 2007
```
  Post-merge fix.


sql/sql_insert.cc:
  Post-merge fix.
```
84d24679

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 929b7b1b

unknown authored Mar 16, 2007

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

929b7b1b

Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql · f5ca9468

unknown authored Mar 16, 2007

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_insert.cc:
  Manually merged

f5ca9468

remove unnecessary line · a2630174
unknown authored Mar 16, 2007

a2630174
merging · 68f09e77
unknown authored Mar 16, 2007

68f09e77