diff options
author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-07-10 17:45:09 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-07-10 17:45:09 +0300 |
commit | fbd9103b7839854201b86ceff2cd1c2b5cedd623 (patch) | |
tree | d090c44817061ae7af69f8cb9b2094f4daad9677 /mysql-test/r/rpl_insert_id.result | |
parent | a8a6361b496ecb15c4d5181c0fed40548016540a (diff) | |
download | mariadb-git-fbd9103b7839854201b86ceff2cd1c2b5cedd623.tar.gz |
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
Diffstat (limited to 'mysql-test/r/rpl_insert_id.result')
-rw-r--r-- | mysql-test/r/rpl_insert_id.result | 2 |
1 files changed, 1 insertions, 1 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); |