1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Post-merge fixes to fix test cases.

mysql-test/extra/rpl_tests/rpl_log.test:
  Using RESET MASTER in the middle of a sequence of statements cause
  a race condition between the dump thread sending the preceeding
  statements to the slave and the RESET MASTER.
mysql-test/suite/federated/federated.test:
  Fixing include paths.
mysql-test/suite/federated/federated_bug_25714.test:
  Removing extreneous lines added by merge.
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
  Correcting typo (the spaces following the connection name was included as part of the name).
mysql-test/t/distinct.test:
  Correcting paths.
This commit is contained in:
Mats Kindahl
2008-10-29 18:38:18 +01:00
parent abe177349b
commit 1f6e419d79
13 changed files with 69 additions and 34 deletions

View File

@ -126,9 +126,13 @@ DROP TABLE t3;
# Bug #6880: LAST_INSERT_ID() within a statement
#
# Reset binlog so that show binlog events will not show the tests
# above.
source include/master-slave-reset.inc;
connection master;
create table t1(a int auto_increment primary key, b int);
insert into t1 values (NULL, 1);
reset master;
set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
source include/show_binlog_events.inc;
@ -138,4 +142,3 @@ drop table t1;
# End of 4.1 tests
sync_slave_with_master;
drop table t1;