Commits · d867df56d0b89c31c19aac7ba868db8cfeb2b051 · nexedi / MariaDB

21 Mar, 2007 15 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · d867df56
  unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  d867df56
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 938867cd
  unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
  938867cd
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 109ea90e
  unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
  109ea90e
- Bug #26825 MySQL Server Crashes in high load · a64458d9
  unknown authored Mar 21, 2007
```
  - initialize to NULL, to avoid call of free on uninitialized variable
```
  a64458d9
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 855ed116
  unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  manual merge
```
  855ed116
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 7d2272f0
  unknown authored Mar 21, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  7d2272f0
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 184baea9
  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
```
  184baea9
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 85e3bced
  unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
  85e3bced
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · f247d6cd
  unknown authored Mar 21, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
```
  f247d6cd
- ndb - bug#27286 (5.0 version) · c1be1e4d
  unknown authored Mar 21, 2007
```
  make sure master is sendable


ndb/src/mgmsrv/MgmtSrvr.cpp:
  make sure master is sendable
```
  c1be1e4d
- ndb - bug#27286 · ccfc96b5
  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
```
  ccfc96b5
- Bug #26825 MySQL Server Crashes in high load · 03abc0cd
  unknown authored Mar 21, 2007
```
- initialize to NULL, to avoid call of free on uninitialized variable
```
  03abc0cd
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 18f65346
  unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
```
  18f65346
- correct event buffer status reporting · 2633c538
  unknown authored Mar 21, 2007
  
  2633c538
- minor fix of ndb cluster startup script · 8c35e048
  unknown authored Mar 21, 2007
  
  8c35e048
20 Mar, 2007 12 commits

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

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

096a80db

enabled test case · c401965e

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

c401965e

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

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

368d8325

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

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

d6ad5ece

ndb - bug#27283 (wl2325-5.0) · 51c28fe1

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

51c28fe1

ndb - bug#27291 · 8f5cf0f1

unknown authored Mar 20, 2007

  Fix correct min-value for LockPagesInMemory


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

8f5cf0f1

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

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

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

98959c96

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 83aa47d8
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
83aa47d8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · bd511c4a
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
bd511c4a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5b42be2a
unknown authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
5b42be2a
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c50f7219
unknown authored Mar 20, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


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

19 Mar, 2007 12 commits

sql_insert.cc: · 8eae769c

unknown authored Mar 20, 2007

  After merge fix.


sql/sql_insert.cc:
  After merge fix.

8eae769c

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

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.

9e408f2d

sql_insert.cc: · a72aa6a6

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.

a72aa6a6

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

ndb - test_event · a12dbd7e

unknown authored Mar 19, 2007

  Fix compile error with gcc4


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

a12dbd7e

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

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

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

9347d491

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


sql/ha_ndbcluster.cc:
  Auto merged
```
1587718f

ndb - bug#20185 · 1d62f09b

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

1d62f09b

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

ndb - autotest · e7676f81

unknown authored Mar 19, 2007

 increase some timeouts...


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

e7676f81

17 Mar, 2007 1 commit

dbug/dbug.c: unused variable removed · fc9c22db

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

fc9c22db