Commits · ff53a753209f407b02c82fb14837df7af6cf5689 · nexedi / MariaDB

21 Jun, 2007 2 commits

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · ff53a753

unknown authored Jun 21, 2007

into  mysql.com:/data2/mysql-5.1-new-ndb


mysql-test/t/rpl_ndb_dd_advance.test:
  Auto merged
mysql-test/t/rpl_ndb_stm_innodb.test:
  SCCS merged

ff53a753

Many files: · 3e8df21a

unknown authored Jun 21, 2007

  New test cases for generic apply status table
rpl_ndb_dd_advance.test:
  Updated test case to not run sooo long
show_binlog_using_logname.inc, tpcb_disk_data.inc:
  New support file 
rpl_ndb_dd_advance.result:
  Updated result
tpcb.inc:
  New support file for Updated test case to not run sooo long


mysql-test/t/rpl_ndb_dd_advance.test:
  Updated test case to not run sooo long
mysql-test/include/tpcb.inc:
  New support file for Updated test case to not run sooo long
mysql-test/r/rpl_ndb_dd_advance.result:
  Updated result
mysql-test/t/rpl_ndb_mix_innodb.test:
  New test cases for generic apply status table
mysql-test/t/rpl_ndb_stm_innodb.test:
  New test cases for generic apply status table
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test:
  New test cases for generic apply status table
mysql-test/t/rpl_ndb_stm_innodb-master.opt:
  New test cases for generic apply status table
mysql-test/t/rpl_ndb_mix_innodb-master.opt:
  New test cases for generic apply status table
mysql-test/include/tpcb_disk_data.inc:
  New support file
mysql-test/include/show_binlog_using_logname.inc:
  New support file
mysql-test/r/rpl_ndb_stm_innodb.result:
  New test cases for generic apply status table
mysql-test/r/rpl_ndb_mix_innodb.result:
  New test cases for generic apply status table

3e8df21a

20 Jun, 2007 2 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · e258e234
  unknown authored Jun 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  e258e234
- Bug #29229 memory corruption in dbtup · 6b25b945
  unknown authored Jun 20, 2007
  
  6b25b945
19 Jun, 2007 6 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · f644f34e
  unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster_cond.h:
  Auto merged
```
  f644f34e
- Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown · 897d4dfb
  unknown authored Jun 19, 2007
  
  897d4dfb
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 7d74c33d
  unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster_cond.h:
  Auto merged
```
  7d74c33d
- Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown · 228fc721
  unknown authored Jun 19, 2007
  
  228fc721
- corrected typo · e41a27b9
  unknown authored Jun 19, 2007
  
  e41a27b9
- turn off binlogging of the updates during wait for not_readonly · 68db008c
  unknown authored Jun 19, 2007
  
  68db008c
18 Jun, 2007 8 commits

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

unknown authored Jun 18, 2007

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


storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

ea8934c5

check for different error message · 76eb66ea
unknown authored Jun 18, 2007

76eb66ea
ndb - bug#29176 missing stack pruning in drop_page · ccb8da82
unknown authored Jun 18, 2007
```
storage/ndb/src/kernel/blocks/pgman.cpp:
  missing stack pruning in drop_page
```
ccb8da82
correction · a2002da6
unknown authored Jun 18, 2007

a2002da6
Bug #28989 hpux11 ps_row warnings · 2e08341c
unknown authored Jun 18, 2007
```
- also remove printout for error 4009
```
2e08341c

fixes Bug #25305 (and several other similar test tailures with the same symptom) · 2c631fe8

unknown authored Jun 18, 2007

- make tests wait until ndb connects properly


mysql-test/extra/rpl_tests/rpl_commit_after_flush.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_delete_no_where.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_log.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_001.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_func003.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
  make tests wait until ndb connects properly
mysql-test/include/have_multi_ndb.inc:
  make tests wait until ndb connects properly
mysql-test/include/have_ndb.inc:
  make tests wait until ndb connects properly
mysql-test/include/ndb_not_readonly.inc:
  make tests wait until ndb connects properly
mysql-test/t/rpl_commit_after_flush.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_delete_no_where.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_2innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_2myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_UUID.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_auto_inc.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_bank.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_basic.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_blob.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_blob2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_charset.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_circular.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_circular_simplex.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_commit_afterflush.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_advance.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_basic.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_partitions.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_ddl.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_delete_nowhere.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_do_db.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_do_table.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_extraCol.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_func003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_idempotent.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_innodb2ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_innodb_trans.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_load.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_myisam2ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_rep_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_row_001.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sp003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sp006.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_stm_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sync.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_trig004.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndbapi_multi.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_001.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_UUID.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_2myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_3innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_7ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_blob_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_blob_myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_charset.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_func003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_log_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_sp003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_sp006_InnoDB.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_stm_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_truncate_7ndb.test:
  make tests wait until ndb connects properly
mysql-test/include/ndb_master-slave.inc:
  New BitKeeper file ``mysql-test/include/ndb_master-slave.inc''

2c631fe8

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

unknown authored Jun 18, 2007

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


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

9b1aa63e

ndb - bug#29167 · 4a0c8322

unknown authored Jun 18, 2007

  Fix case where all node in node group dies before they saved sysfile (wrt gcp)
  and Qmgr incorrectly thinks that "node group is missing"


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  code
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  test
storage/ndb/test/run-test/daily-basic-tests.txt:
  test

4a0c8322

17 Jun, 2007 7 commits

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

unknown authored Jun 17, 2007

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


mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/r/ndb_restore.result:
  null merge

49c21820

correct test and result · c9825175
unknown authored Jun 17, 2007

c9825175
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · f8c5e5f7
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
f8c5e5f7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 1f2c0193
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
1f2c0193

Bug #28989 hpux11 ps_row warnings · 95497dcc

unknown authored Jun 17, 2007

- do not print 701 dictionary busy error


sql/ha_ndbcluster.cc:
  save the ndb error such that it can be traced
sql/ha_ndbcluster.h:
  save the ndb error such that it can be traced
sql/ha_ndbcluster_binlog.cc:
  use the traced ndb error to determine if it is an error that should be printed

95497dcc

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

unknown authored Jun 17, 2007

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


mysql-test/r/ndb_restore.result:
  null merge
mysql-test/t/ndb_restore.test:
  null merge

7bbf3901

BUG#27640 · f2c7b62a
unknown authored Jun 17, 2007
```
- correct test and result file
```
f2c7b62a

16 Jun, 2007 1 commit

Bug #28949 · e2380b98

unknown authored Jun 16, 2007

- handler binlog's must be shutdoem before logger.cleanup_base

e2380b98

14 Jun, 2007 14 commits

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a3c2ebbc
unknown authored Jun 14, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
a3c2ebbc
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · d520cd08
unknown authored Jun 14, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
d520cd08
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · cc75d9ea
unknown authored Jun 14, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
cc75d9ea

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

unknown authored Jun 14, 2007

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


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  manual merge

b42f4237

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

unknown authored Jun 14, 2007

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


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged

ec885d9c

Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed" · ebcbfef8
unknown authored Jun 14, 2007
```
- correction, missing node id
```
ebcbfef8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 0d075202
unknown authored Jun 14, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
0d075202

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · d442b5a5

unknown authored Jun 14, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/handler.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
storage/ndb/src/ndbapi/Ndb.cpp:
  Merge

d442b5a5

bug#29099 - slow backup for disk data · e59c1f5d

unknown authored Jun 14, 2007

- implement read ahead during disk data scan


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  maximum read ahead
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  maximum read ahead should not be larger than page buffer size
  maximum aslo set to 32 pages
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  read ahead for disk data scan
storage/ndb/src/kernel/blocks/pgman.cpp:
  set higher max_io_waits for read ahead
  round off upwards in page_buffer size
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  add null callback to be used for read ahead (no callback needed)
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  add null callback to be used for read ahead (no callback needed)
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  remove the debug trace, not needed any more
storage/ndb/test/tools/hugoFill.cpp:
  allow setting database in hugoFill

e59c1f5d

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · d168b042

unknown authored Jun 14, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged

d168b042

Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY... · 16048913

unknown authored Jun 14, 2007

Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb, post review fix

16048913

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 90423a37
unknown authored Jun 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
90423a37
correct warning · 9905b81e
unknown authored Jun 14, 2007

9905b81e

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · edb853a6

unknown authored Jun 14, 2007

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

edb853a6