Commits · 824a9772588ed328c0a2c31d92038a39aeaf3d85 · nexedi / MariaDB

20 Jun, 2007 8 commits
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 824a9772
  unknown authored Jun 20, 2007
```
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
```
  824a9772
- Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · bf1f7a2a
  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
```
  bf1f7a2a
- Bug #27583 slave sql fails to read from iocache when slave got stopped at pos==4 · 1b42af2c
  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.
```
  1b42af2c
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · c3edf70e
  unknown authored Jun 20, 2007
```
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
```
  c3edf70e
- Adding missing DROP TABLE statement to ndb_backup_print.test since it · dac66b91
  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.
```
  dac66b91
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 4c8a90b2
  unknown authored Jun 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


sql/ha_ndbcluster_cond.h:
  Auto merged
```
  4c8a90b2
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · c98f3163
  unknown authored Jun 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  c98f3163
- Bug #29229 memory corruption in dbtup · 855c1150
  unknown authored Jun 20, 2007
  
  855c1150
19 Jun, 2007 12 commits

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.

795127fd

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

unknown authored Jun 19, 2007

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


sql/ha_ndbcluster_cond.h:
  Auto merged

77fa5094

Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown · 29b679f2
unknown authored Jun 19, 2007

29b679f2

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

unknown authored Jun 19, 2007

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


sql/ha_ndbcluster_cond.h:
  Auto merged

baee6397

Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown · 32c328c5
unknown authored Jun 19, 2007

32c328c5
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 85002693
unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
```
85002693
corrected typo · 6cd0f198
unknown authored Jun 19, 2007

6cd0f198
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 6ad18428
unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
```
6ad18428

WL#3303 · 7f32d34e

unknown authored Jun 19, 2007

- get the ndb flags right, so that the behaviour is as before

7f32d34e

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 7b81f504
unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
```
7b81f504
turn off binlogging of the updates during wait for not_readonly · ec015787
unknown authored Jun 19, 2007

ec015787

Fixes to tests and test results. · 01617667

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.

01617667

18 Jun, 2007 20 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 58c6a6a7

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

58c6a6a7

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

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

5f9aaa3e

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

f2b7fdf1
ndb - bug#29176 missing stack pruning in drop_page · 21c4448e
unknown authored Jun 18, 2007
```
storage/ndb/src/kernel/blocks/pgman.cpp:
  missing stack pruning in drop_page
```
21c4448e
correction · cd89518b
unknown authored Jun 18, 2007

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

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

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''

7b081501

Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · e9fc35c4
unknown authored Jun 18, 2007
```
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
```
e9fc35c4
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 5b40162c
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/innodb.test:
  Auto merged
```
5b40162c

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 8f9b1ec9

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

8f9b1ec9

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 69f01d70
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
69f01d70
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · ca9b245b
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
ca9b245b
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 1b98baef
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
1b98baef

Fixes to make team-tree green. · 59176261

unknown authored Jun 18, 2007


mysql-test/r/binlog_multi_engine.result:
  Result change
mysql-test/t/binlog_multi_engine.test:
  Commenting out statements that generate non-deterministic results.

59176261

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 3a7c8406

unknown authored Jun 18, 2007

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


mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
mysql-test/t/ndb_replace.test:
  Auto merged
mysql-test/t/ndb_update.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_row_inexist_tbl.test:
  Auto merged
sql/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-ndb_binlog_basic2.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/item_create.cc:
  Manual merge

3a7c8406

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


mysql-test/t/innodb.test:
  Auto merged
```
dc69073e
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 23fa1e31
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
23fa1e31
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 6b297825
unknown authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
6b297825
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0e7f9df4
unknown authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


configure.in:
  Auto merged
```
0e7f9df4
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5004acef
unknown authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
5004acef