diff options
| author | unknown <mskold@mysql.com> | 2006-03-06 18:08:42 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-03-06 18:08:42 +0100 |
| commit | 29c66eea2729b0c7e8786940695967e6920aa392 (patch) | |
| tree | 79d3587fa7a8b7a66b83aff632a5672b5400a095 /mysql-test | |
| parent | 44bcc85b1212bc2c7c08709d8fb4a136c26350cd (diff) | |
| parent | 807a74a33566372e36a3a4d009f4a0f9f2891b53 (diff) | |
| download | mariadb-git-29c66eea2729b0c7e8786940695967e6920aa392.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_multi_row.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/ndb_multi_row.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/ndb_multi_row.result b/mysql-test/r/ndb_multi_row.result index 2717314e30e..64b151d42a9 100644 --- a/mysql-test/r/ndb_multi_row.result +++ b/mysql-test/r/ndb_multi_row.result @@ -60,4 +60,6 @@ t2 t3 t4 drop table t1, t2, t3, t4; -drop table t1, t3, t4; +drop table if exists t1, t3, t4; +Warnings: +Error 155 Table 'test.t3' doesn't exist diff --git a/mysql-test/t/ndb_multi_row.test b/mysql-test/t/ndb_multi_row.test index bc1389ac654..05a0944e99a 100644 --- a/mysql-test/t/ndb_multi_row.test +++ b/mysql-test/t/ndb_multi_row.test @@ -71,6 +71,6 @@ show tables; drop table t1, t2, t3, t4; connection server2; -drop table t1, t3, t4; +drop table if exists t1, t3, t4; # End of 4.1 tests |