Commits · d535734df9de7ef964178cb588605499162591b7 · nexedi / MariaDB

29 Aug, 2006 4 commits

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

ndb - · 587f988d

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

587f988d

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

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

45ce98e5

ndb - · e7825bf7

unknown authored Aug 29, 2006

  fix backup/lcp race


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

e7825bf7

28 Aug, 2006 5 commits

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

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

7c921d08

ndb - · fea4cde2

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

fea4cde2

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

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

85be485f

ndb - bug#21615 · 6a528af6

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

6a528af6

ndb - autotest · fa8ffaf8

unknown authored Aug 28, 2006

  adopt to new error code 755 (invalid tablespace)


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

fa8ffaf8

25 Aug, 2006 3 commits
- ndb - fix some bug in testSRBank · 353cf6a0
  unknown authored Aug 25, 2006
  
  353cf6a0
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · e855994e
  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
```
  e855994e
- ndb - bug#21806 · b3d07c54
  unknown authored Aug 25, 2006
```
  disable ndb_autodiscover3 (cluster restart (--initial))


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

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

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

ce28134d

ndb - · f428b538

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

f428b538

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

unknown authored Aug 24, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged

58eed59a

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

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

ad204a69

ndb - · f9d5c807

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

f9d5c807

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


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

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 134a5d56

unknown authored Aug 24, 2006

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


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

134a5d56

ndb - bug#21800 · e748962e

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

e748962e

23 Aug, 2006 4 commits

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

ndb - sr - · 43c6a8dd

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)

43c6a8dd

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb · 137abd42

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

137abd42

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

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

1b76be33

22 Aug, 2006 16 commits

correct merge · ac1b254c
unknown authored Aug 22, 2006

ac1b254c

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

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

b1d721eb

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

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

bd1accb1

Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb · 7d8d7b31
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
```
7d8d7b31
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb · 2a36109b
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017
```
2a36109b
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb · 7b1d69f3
unknown authored Aug 22, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb


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

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

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

482b09e8

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

ndb - · c12b99fd

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

c12b99fd

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


sql/sql_show.cc:
  Auto merged
```
a5b458e9

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

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

fd39e5b2

ndb - · 6e6555df

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

6e6555df