more 4.1->5.0 merge fixes for bug#14553

parent 8f71e47a
...@@ -73,7 +73,7 @@ CREATE TABLE t1 ( a INT UNIQUE ); ...@@ -73,7 +73,7 @@ CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1); INSERT INTO t1 VALUES (1),(1);
ERROR 23000: Duplicate entry '1' for key 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 t1(a int auto_increment, key(a));
create table t2(a int); create table t2(a int);
insert into t1 (a) values (null); insert into t1 (a) values (null);
......
...@@ -82,7 +82,6 @@ sync_slave_with_master; ...@@ -82,7 +82,6 @@ sync_slave_with_master;
# Bug#14553: NULL in WHERE resets LAST_INSERT_ID # Bug#14553: NULL in WHERE resets LAST_INSERT_ID
# #
connection master; connection master;
drop table if exists t1,t2;
create table t1(a int auto_increment, key(a)); create table t1(a int auto_increment, key(a));
create table t2(a int); create table t2(a int);
insert into t1 (a) values (null); insert into t1 (a) values (null);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment