mariadb/mysql-test/extra/rpl_tests
unknown 32f349ed75 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/windows.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/windows.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
BitKeeper/deleted/.del-ps_not_windows.result:
  Delete: mysql-test/r/ps_not_windows.result
BitKeeper/deleted/.del-ps_not_windows.test:
  Delete: mysql-test/t/ps_not_windows.test
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/rpl_deadlock_innodb.result:
  Manual merge
2006-11-23 18:38:27 +01:00
..
rpl_auto_increment.test
rpl_commit_after_flush.test
rpl_ddl.test
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
rpl_EE_err.test
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
rpl_flsh_tbls.test
rpl_foreign_key.test
rpl_insert_id.test
rpl_insert_id_pk.test
rpl_insert_ignore.test
rpl_loaddata.test
rpl_log.test
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
rpl_multi_update.test
rpl_multi_update2.test
rpl_multi_update3.test
rpl_ndb_2multi_eng.test
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
rpl_relayrotate.test
rpl_reset_slave.test
rpl_row_001.test
rpl_row_basic.test
rpl_row_blob.test
rpl_row_charset.test
rpl_row_delayed_ins.test
rpl_row_func003.test
rpl_row_sp002.test
rpl_row_sp003.test
rpl_row_sp006.test
rpl_row_sp007.test
rpl_row_tabledefs.test
rpl_row_UUID.test
rpl_stm_000001.test
rpl_stm_charset.test
rpl_stm_EE_err2.test
rpl_sv_relay_space.test
rpl_trig004.test
rpl_truncate.test
rpl_truncate_helper.test Update test results to new mysqltest 2006-10-04 23:48:24 +02:00