unknown a043cd152d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 ...

into  mysql.com:/home/my/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_binary.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  Manual merge
mysql-test/t/ndb_update.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge

2007-01-22 19:18:22 +02:00

..

rpl_auto_increment.test

Give warnings for unused objects

2007-01-22 18:42:52 +02: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

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

2006-11-23 18:38:27 +01: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_extraSlave_Col.test

Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after

2006-11-03 16:31:25 +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

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

2006-10-04 16:35:40 +02:00

rpl_foreign_key.test

Give warnings for unused objects

2007-01-22 18:42:52 +02:00

rpl_insert_id_pk.test

Give warnings for unused objects

2007-01-22 18:42:52 +02:00

rpl_insert_id.test

Give warnings for unused objects

2007-01-22 18:42:52 +02:00

rpl_insert_ignore.test

WL#1012: All changes as one single changeset.

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

rpl_loaddata.test

Give warnings for unused objects

2007-01-22 18:42:52 +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

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

2006-11-15 10:31:23 +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

ndb -

2006-08-29 10:47: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_ndb_ddl.test

Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after

2006-11-03 16:31:25 +01: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_basic.test

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2007-01-22 19:18:22 +02: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

Bug #24998 rpl_row_delayed_ins.test fails in pushbuild

2007-01-11 23:59:12 +02: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

BUG#24490 (segfault inside unpack_row at Field_bit_as_char::set_default()):

2006-12-05 10:46:03 +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

Changes made according to HLD/LLD.

2006-08-30 10:22:43 +03:00

rpl_stm_charset.test

After merge fix:

2006-12-29 17:12:59 +04:00

rpl_stm_EE_err2.test

Give warnings for unused objects

2007-01-22 18:42:52 +02: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

Give warnings for unused objects

2007-01-22 18:42:52 +02:00

rpl_truncate_helper.test

Update test results to new mysqltest

2006-10-04 23:48:24 +02:00

rpl_truncate.test

WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.

2006-12-07 09:18:35 -05:00