From fbd9103b7839854201b86ceff2cd1c2b5cedd623 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 10 Jul 2006 17:45:09 +0300 Subject: [PATCH] more 4.1->5.0 merge fixes for bug#14553 mysql-test/r/rpl_insert_id.result: more merge fixes for bug#14553 mysql-test/t/rpl_insert_id.test: more merge fixes for bug#14553 --- mysql-test/r/rpl_insert_id.result | 2 +- mysql-test/t/rpl_insert_id.test | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result index 21eade8f9cf..20538c705a0 100644 --- a/mysql-test/r/rpl_insert_id.result +++ b/mysql-test/r/rpl_insert_id.result @@ -73,7 +73,7 @@ CREATE TABLE t1 ( a INT UNIQUE ); SET FOREIGN_KEY_CHECKS=0; INSERT INTO t1 VALUES (1),(1); ERROR 23000: Duplicate entry '1' for key 1 -drop table if exists t1, t2; +drop table t1; create table t1(a int auto_increment, key(a)); create table t2(a int); insert into t1 (a) values (null); diff --git a/mysql-test/t/rpl_insert_id.test b/mysql-test/t/rpl_insert_id.test index 94ce7f95fb4..d2866bca60f 100644 --- a/mysql-test/t/rpl_insert_id.test +++ b/mysql-test/t/rpl_insert_id.test @@ -82,7 +82,6 @@ sync_slave_with_master; # Bug#14553: NULL in WHERE resets LAST_INSERT_ID # connection master; -drop table if exists t1,t2; create table t1(a int auto_increment, key(a)); create table t2(a int); insert into t1 (a) values (null);