Commits · 9ec8dba632d433faf8a8cbd64f96df54e753931e · nexedi / MariaDB

29 Aug, 2006 4 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 9ec8dba6
unknown authored Aug 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
9ec8dba6

ndb - · 8501296a

unknown authored Aug 29, 2006

  Add order by in rpl_(ndb)_multi_update3 to make result deterministic


mysql-test/extra/rpl_tests/rpl_multi_update3.test:
  Add order by in rpl_(ndb)_multi_update3 to make result deterministic
mysql-test/r/rpl_multi_update3.result:
  Add order by in rpl_(ndb)_multi_update3 to make result deterministic
mysql-test/r/rpl_ndb_multi_update3.result:
  Add order by in rpl_(ndb)_multi_update3 to make result deterministic

8501296a

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · d4ffbe74

unknown authored Aug 29, 2006

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


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

d4ffbe74

ndb - · 2479d384

unknown authored Aug 29, 2006

  fix backup/lcp race


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  fix backup/lcp race

2479d384

28 Aug, 2006 5 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · f26782ad

unknown authored Aug 28, 2006

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


storage/ndb/test/src/NDBT_Tables.cpp:
  Auto merged

f26782ad

ndb - · 20ee9cea

unknown authored Aug 28, 2006

  Snapup testBackup XXXerror


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Snapup testBackup XXXerror
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Snapup testBackup XXXerror

20ee9cea

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

unknown authored Aug 28, 2006

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


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

c93a7fa1

ndb - bug#21615 · b931e3eb

unknown authored Aug 28, 2006

  Improve error message when detecting corrupted REDO log


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Improve error message when detecting corrupted REDO log

b931e3eb

ndb - autotest · 4317632e

unknown authored Aug 28, 2006

  adopt to new error code 755 (invalid tablespace)


storage/ndb/test/src/NDBT_Tables.cpp:
  Fxi new error code

4317632e

25 Aug, 2006 3 commits
- ndb - fix some bug in testSRBank · 14b4a251
  unknown authored Aug 25, 2006
  
  14b4a251
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 42f74d76
  unknown authored Aug 25, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
```
  42f74d76
- ndb - bug#21806 · 4cf7be0c
  unknown authored Aug 25, 2006
```
  disable ndb_autodiscover3 (cluster restart (--initial))


mysql-test/t/disabled.def:
  ndb - bug#21806
```
  4cf7be0c
24 Aug, 2006 8 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 5cbd0a52

unknown authored Aug 24, 2006

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


mysql-test/t/disabled.def:
  Auto merged

5cbd0a52

ndb - · 430ff6e5

unknown authored Aug 24, 2006

  disable ndb_binlog_discover as it's broken
  remove debug printout


mysql-test/t/disabled.def:
  disable ndb_binlog_discover as it's broken
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  remove debug printout

430ff6e5

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 7e7acfbe

unknown authored Aug 24, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged

7e7acfbe

ndb - fix monster bug in NdbEventOperation->stop where Suma sent uninitialized data · d5246bb1

unknown authored Aug 24, 2006

affects basically all replication tests

storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
1) Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
2) make sure to set NdbdNodeId on _TE_STOP
storage/ndb/src/ndbapi/NdbBlob.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/Ndbif.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

d5246bb1

ndb - · 13dc0ea7

unknown authored Aug 24, 2006

  bug#21800 - 5.0 -> 5.1 merge


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  bug#21800 - 5.0 -> 5.1 merge

13dc0ea7

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 4cf8b579
unknown authored Aug 24, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work


sql/ha_ndbcluster.cc:
  Auto merged
```
4cf8b579

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 84f393f7

unknown authored Aug 24, 2006

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


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

84f393f7

ndb - bug#21800 · 5d82bec5

unknown authored Aug 24, 2006

  read TransactionDeadlockTimeout (for scans) to cater for insane settings


ndb/src/ndbapi/NdbScanOperation.cpp:
  read TransactionDeadlockTimeout to cater for insane settings

5d82bec5

23 Aug, 2006 4 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 184e9f0c
unknown authored Aug 23, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
184e9f0c

ndb - sr - · 3841ca40

unknown authored Aug 23, 2006

  Fix so that expand_check2 is only run per fragment,
  as restore now works 1 fragment at a time (again)


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix so that expand_check2 is only run per fragment,
    as restore now works 1 fragment at a time (again)

3841ca40

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb · 9f542541

unknown authored Aug 23, 2006

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


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

9f542541

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

unknown authored Aug 23, 2006

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

c251e8a8

22 Aug, 2006 16 commits

correct merge · 9c293634
unknown authored Aug 22, 2006

9c293634

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · 6e8d8b62

unknown authored Aug 22, 2006

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


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

6e8d8b62

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · df4afa6e

unknown authored Aug 22, 2006

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


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/disabled.def:
  merge
sql/ha_ndbcluster.cc:
  merge

df4afa6e

Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb · 7373f112
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
```
7373f112
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb · 91c28daf
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017
```
91c28daf
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb · f9e7bf9b
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb


sql/ha_ndbcluster.cc:
  ul
```
f9e7bf9b
ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables · 06b1f15d
unknown authored Aug 22, 2006
```
sql/ha_ndbcluster.cc:
  calculate frags with (ulonglong)max_rows in case --without-big-tables
```
06b1f15d
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 3da7bceb
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
```
3da7bceb
Update result file for "grant" to 5.1 version · a649c631
unknown authored Aug 22, 2006
```
mysql-test/r/grant.result:
  Update result file format to 5.1 version
```
a649c631

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · c26fa261

unknown authored Aug 22, 2006

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


mysql-test/t/disabled.def:
  Auto merged

c26fa261

ndb - reenable "random" failing test · 56b51e7e
unknown authored Aug 22, 2006
```
mysql-test/t/disabled.def:
  reenable "random" failing
```
56b51e7e

ndb - · 84d494a7

unknown authored Aug 22, 2006

  add another possible ok error in testcase


mysql-test/t/ndb_binlog_discover.test:
  add another possible ok error in testcase

84d494a7

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1c031c9b
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
```
1c031c9b
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 · 239c28be
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb


sql/sql_show.cc:
  Auto merged
```
239c28be

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · e60c02f7

unknown authored Aug 22, 2006

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


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

e60c02f7

ndb - · a41d0b8a

unknown authored Aug 22, 2006

reenable some test after adding sync_with_master to end of test
to make sure that binlog has been applied to slave before end of test

mysql-test/t/disabled.def:
reenable test after adding extra sync_with_master
mysql-test/t/rpl_ndb_func003.test:
add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_ndb_idempotent.test:
add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_row_basic_7ndb.test:
add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_truncate_7ndb.test:
add sync slave with master, to make sure that binlog has been applied to slave before end of test

a41d0b8a