diff options
| author | unknown <monty@mysql.com> | 2005-04-28 00:41:39 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-28 00:41:39 +0300 |
| commit | df0a4ed64e255c1ae3aa9bf4202f2b5e1f41e940 (patch) | |
| tree | 7fb8cb0e958d8b306b4dc2a7ed2c3de1d6d5beca /mysql-test | |
| parent | 57d9c6d077bd6f2d437457e1bc4aa86607e80f46 (diff) | |
| parent | 167ce823942355b908f4cc70ebbe09d77adbf91c (diff) | |
| download | mariadb-git-df0a4ed64e255c1ae3aa9bf4202f2b5e1f41e940.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/drop.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/innodb-replace.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/innodb-replace.test | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result index 40dda86b729..b07cf16aa64 100644 --- a/mysql-test/r/drop.result +++ b/mysql-test/r/drop.result @@ -30,13 +30,13 @@ table7, table8, table9, table10, table11, table12, table13, table14, table15, table16, table17, table18, table19, table20, table21, table22, table23, table24, table25, table26, table27, table28; -ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table14,table15,table16,table17,table18,table19,table20,table21,table22,table23,table' +ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table' drop table table1, table2, table3, table4, table5, table6, table7, table8, table9, table10, table11, table12, table13, table14, table15, table16, table17, table18, table19, table20, table21, table22, table23, table24, table25, table26, table27, table28, table29, table30; -ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table14,table15,table16,table17,table18,table19,table20,table21,table22,table23,table' +ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table' use test; drop database mysqltest; flush tables with read lock; diff --git a/mysql-test/r/innodb-replace.result b/mysql-test/r/innodb-replace.result index a27806640ad..b7edcc49e56 100644 --- a/mysql-test/r/innodb-replace.result +++ b/mysql-test/r/innodb-replace.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb; select * from t1; c1 c2 stamp diff --git a/mysql-test/t/innodb-replace.test b/mysql-test/t/innodb-replace.test index e7e96da1443..516f058a68e 100644 --- a/mysql-test/t/innodb-replace.test +++ b/mysql-test/t/innodb-replace.test @@ -2,6 +2,10 @@ # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc +--disable_warnings +drop table if exists t1; +--enable_warnings + # # Bug #1078 # |