Commits · c2112f5fd0f8c4ea8102002726d12c6d5c5e48c3 · nexedi / MariaDB

21 Jun, 2007 2 commits

Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · c2112f5f
unknown authored Jun 21, 2007
```
into  kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
```
c2112f5f

Fixing result mismatch in rpl_deadlock_innodb result file. · b358c3bd

unknown authored Jun 21, 2007


mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Using include/show_slave_status.inc to get correct masking of columns.
mysql-test/r/rpl_deadlock_innodb.result:
  result change

b358c3bd

20 Jun, 2007 9 commits
- Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 · dc9db0d9
  unknown authored Jun 20, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
```
  dc9db0d9
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · a2fe3bf0
  unknown authored Jun 20, 2007
```
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
```
  a2fe3bf0
- Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · c3058986
  unknown authored Jun 20, 2007
```
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27583-merge


sql/log_event.cc:
  manual merge, use local as the patch is in 5.1
```
  c3058986
- Bug #27583 slave sql fails to read from iocache when slave got stopped at pos==4 · c8bdab11
  unknown authored Jun 20, 2007
```
forgotten merge with 5.0. There can be some bugs waiting for this fix in 5.0 like Bug@29232


sql/log_event.cc:
  file name is changed in step with the position.
```
  c8bdab11
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · e52180ab
  unknown authored Jun 20, 2007
```
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
```
  e52180ab
- Adding missing DROP TABLE statement to ndb_backup_print.test since it · 3de3c7a0
  unknown authored Jun 20, 2007
```
causes later tests to fail.


mysql-test/r/ndb_backup_print.result:
  Result change.
mysql-test/t/ndb_backup_print.test:
  Adding missing drop table at the end of the test.
```
  3de3c7a0
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 461a4a83
  unknown authored Jun 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


sql/ha_ndbcluster_cond.h:
  Auto merged
```
  461a4a83
- 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 17 commits
- Some test case fixes. · afabda8f
  unknown authored Jun 19, 2007
```
mysql-test/r/binlog_multi_engine.result:
  Result change
mysql-test/t/binlog_multi_engine.test:
  Fixing test case. Keeping some bad statements in the test since I don't
  want to disable the entire test. Have marked the offending statement
  so that they can easily be found.
```
  afabda8f
- 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
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 7d16183b
  unknown authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1


configure.in:
  Auto merged
```
  7d16183b
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · f6ae8e76
  unknown authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1


configure.in:
  Auto merged
```
  f6ae8e76
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8f24e822
  unknown authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0


configure.in:
  Auto merged
```
  8f24e822
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 37d6aba9
  unknown authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  37d6aba9
- try again. · 32b6fbe5
  unknown authored Jun 19, 2007
```
configure.in:
  Raise version number after cloning 5.0.44
```
  32b6fbe5
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 7aa57d43
  unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
```
  7aa57d43
- corrected typo · e41a27b9
  unknown authored Jun 19, 2007
  
  e41a27b9
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · ba6578c6
  unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
```
  ba6578c6
- WL#3303 · ccfa3bf3
  unknown authored Jun 19, 2007
```
- get the ndb flags right, so that the behaviour is as before
```
  ccfa3bf3
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 13b53679
  unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
```
  13b53679
- turn off binlogging of the updates during wait for not_readonly · 68db008c
  unknown authored Jun 19, 2007
  
  68db008c
- Fixes to tests and test results. · 312ae6ec
  unknown authored Jun 19, 2007
```
mysql-test/r/binlog_unsafe.result:
  Result change
mysql-test/r/rpl_loaddata_fatal.result:
  Result change
mysql-test/r/rpl_udf.result:
  Result change
mysql-test/t/binlog_innodb.test:
  Test requires binary log
mysql-test/t/binlog_unsafe.test:
  Test requires binary log
mysql-test/t/multi_update.test:
  Test requires binary log.
  Error changed for a statement.
mysql-test/t/rpl_row_basic_11bugs.test:
  Error changed for a statement.
```
  312ae6ec
18 Jun, 2007 12 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 511ef0cc

unknown authored Jun 18, 2007

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


mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Auto merged
mysql-test/t/rpl_ndb_bank.test:
  Auto merged
mysql-test/t/rpl_ndb_basic.test:
  Auto merged
mysql-test/t/rpl_ndb_do_table.test:
  Auto merged
mysql-test/t/rpl_ndb_idempotent.test:
  Auto merged
mysql-test/t/rpl_ndb_stm_innodb.test:
  Auto merged
mysql-test/t/rpl_ndb_sync.test:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
mysql-test/include/have_multi_ndb.inc:
  manual merge
mysql-test/include/have_ndb.inc:
  manual merge
mysql-test/t/rpl_ndb_commit_afterflush.test:
  manual merge
mysql-test/t/rpl_ndb_ddl.test:
  manual merge
mysql-test/t/rpl_ndb_innodb_trans.test:
  manual merge

511ef0cc

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 kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · 9d09201a
unknown authored Jun 18, 2007
```
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
```
9d09201a
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 0e895c1c
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/innodb.test:
  Auto merged
```
0e895c1c

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 6da3c0fa

unknown authored Jun 18, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

6da3c0fa

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 7969b6a6
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
7969b6a6
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 66330935
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
66330935