diff options
author | unknown <kent@mysql.com> | 2005-07-05 23:21:30 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2005-07-05 23:21:30 +0200 |
commit | 711464a11de68abe5835a74a41f7c347a1e93b67 (patch) | |
tree | 92fad3c9e4e8ec6025422ec3b80cc391eb5ed319 | |
parent | 63c5a72b314bcf4ad68e120fa2e16caa861bb822 (diff) | |
parent | 3da6f7195740dc3ab5ded69a8a8959ff1676502e (diff) | |
download | mariadb-git-711464a11de68abe5835a74a41f7c347a1e93b67.tar.gz |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
-rw-r--r-- | mysql-test/r/lowercase_table2.result | 2 | ||||
-rw-r--r-- | mysql-test/t/lowercase_table2.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/r/lowercase_table2.result index f93a10dfbad..44235cbf900 100644 --- a/mysql-test/r/lowercase_table2.result +++ b/mysql-test/r/lowercase_table2.result @@ -1,7 +1,7 @@ DROP TABLE IF EXISTS t1,t2,t3,t2aA,t1Aa; DROP DATABASE IF EXISTS `TEST_$1`; DROP DATABASE IF EXISTS `test_$1`; -DROP DATABASE mysqltest_LC2; +DROP DATABASE IF EXISTS mysqltest_LC2; CREATE TABLE T1 (a int); INSERT INTO T1 VALUES (1); SHOW TABLES LIKE "T1"; diff --git a/mysql-test/t/lowercase_table2.test b/mysql-test/t/lowercase_table2.test index 5e38c59386d..f5cf292482e 100644 --- a/mysql-test/t/lowercase_table2.test +++ b/mysql-test/t/lowercase_table2.test @@ -13,7 +13,7 @@ enable_query_log; DROP TABLE IF EXISTS t1,t2,t3,t2aA,t1Aa; DROP DATABASE IF EXISTS `TEST_$1`; DROP DATABASE IF EXISTS `test_$1`; -DROP DATABASE mysqltest_LC2; +DROP DATABASE IF EXISTS mysqltest_LC2; --enable_warnings CREATE TABLE T1 (a int); |