unknown 30de4903ae Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 ...

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/create_not_windows.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  manuakl merge
mysql-test/lib/mtr_process.pl:
  manuakl merge
mysql-test/mysql-test-run.pl:
  manuakl merge
mysql-test/r/type_newdecimal.result:
  manuakl merge
mysql-test/t/create.test:
  manuakl merge
mysql-test/t/func_group.test:
  manuakl merge
mysql-test/t/type_newdecimal.test:
  manuakl merge

2006-07-05 16:16:09 -04:00

..

rpl_auto_increment.test

Updated test cases

2006-02-13 16:36:11 +01:00

rpl_commit_after_flush.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_ddl.test

Bug#19066 (DELETE FROM inconsistency for NDB):

2006-06-01 11:53:27 +02:00

rpl_deadlock.test

Manually merged

2006-04-25 13:04:39 +04:00

rpl_delete_no_where.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_EE_err.test

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var

2006-01-24 14:10:48 +01:00

rpl_failed_optimize.test

Don't use row level logging on optimize or repair table.

2006-05-05 20:08:40 +03:00

rpl_flsh_tbls.test

rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test:

2006-05-12 14:09:13 +02:00

rpl_foreign_key.test

rpl_foreign_key.test:

2006-01-23 14:07:58 +01:00

rpl_insert_id_pk.test

Cleanup testcases

2006-05-31 23:34:28 +02:00

rpl_insert_id.test

Merge from 5.0

2006-05-31 11:18:58 +03:00

rpl_insert_ignore.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_loaddata.test

Cleanup testcases

2006-05-31 23:34:28 +02:00

rpl_log.test

Fix for bug #20601: rpl_ndb_log.test failure

2006-06-21 18:16:07 +05:00

rpl_max_relay_size.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_multi_query.test

WL#3023 (RBR: Use locks in a statement-like manner):

2006-02-24 16:19:55 +01:00

rpl_multi_update2.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_multi_update3.test

Cleanup testcases

2006-05-31 23:34:28 +02:00

rpl_multi_update.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_ndb_2multi_eng.test

test update

2006-04-12 19:38:40 +02:00

rpl_partition.test

Bug#18436 (RBR: Replication to partition engine triggers assertion on slave):

2006-03-27 14:58:37 +02:00

rpl_relayrotate.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_reset_slave.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_row_001.test

Fix test cases to work with non-standard --vardir.

2006-02-22 10:07:54 +01:00

rpl_row_blob.test

perform sync slave with master in rpl_ndb_blob2 to ensure that tables get properly dropped on slave...

2006-04-10 16:06:28 +02:00

rpl_row_charset.test

WL#3023 (RBR: Use locks in a statement-like manner):

2006-03-03 09:49:46 +01:00

rpl_row_delayed_ins.test

Merge mysqldev@production.mysql.com:my/mysql-5.1-release

2006-02-24 16:31:38 +01:00

rpl_row_func003.test

Fix test cases to work with non-standard --vardir.

2006-02-22 10:07:54 +01:00

rpl_row_sp002.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_row_sp003.test

test updates

2006-02-10 12:52:35 +01:00

rpl_row_sp006.test

Cleanup testcases

2006-05-31 23:34:28 +02:00

rpl_row_sp007.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_row_tabledefs.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_row_UUID.test

increase save_master_pos timeout to 30 seconds for higher test predictability

2006-04-12 15:55:41 +02:00

rpl_stm_000001.test

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var

2006-02-07 18:04:50 +01:00

rpl_stm_charset.test

WL#3023 (RBR: Use locks in a statement-like manner):

2006-02-24 16:19:55 +01:00

rpl_stm_EE_err2.test

RBR test updates per lars request

2006-01-11 20:02:11 +01:00

rpl_sv_relay_space.test

Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):

2006-04-19 15:29:49 +02:00

rpl_trig004.test

Test updates

2006-02-15 14:02:47 +01:00

rpl_truncate_helper.test

Replication/Backup Team Tree test fixing.

2006-06-19 09:25:49 +02:00

rpl_truncate.test

Replication/Backup Team Tree test fixing.

2006-06-19 09:25:49 +02:00