diff options
| author | evgen@moonbone.local <> | 2005-06-23 03:51:10 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2005-06-23 03:51:10 +0400 |
| commit | dc65464688e1ea406e8607d0a2c1dea07d977a18 (patch) | |
| tree | 3a9c441d03ddf6e03220c8743b1180c282f5fa8e /mysql-test | |
| parent | 5c8e3341d3764e06be0196f109cbf015bab99f09 (diff) | |
| download | mariadb-git-dc65464688e1ea406e8607d0a2c1dea07d977a18.tar.gz | |
insert_update.result, insert_update.test, sql_base.cc:
Fix for bugfix #9728 merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/insert_update.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/insert_update.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index 6d3aa941c8c..739beea6286 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -1,4 +1,4 @@ -DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 (a INT, b INT, c INT, UNIQUE (A), UNIQUE(B)); INSERT t1 VALUES (1,2,10), (3,4,20); INSERT t1 VALUES (5,6,30) ON DUPLICATE KEY UPDATE c=c+100; diff --git a/mysql-test/t/insert_update.test b/mysql-test/t/insert_update.test index f5857840588..7653fd8dd42 100644 --- a/mysql-test/t/insert_update.test +++ b/mysql-test/t/insert_update.test @@ -1,5 +1,5 @@ --disable_warnings -DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t1, t2; --enable_warnings CREATE TABLE t1 (a INT, b INT, c INT, UNIQUE (A), UNIQUE(B)); |