Merge mysql.com:/home/bkroot/mysql-5.0

into mysql.com:/home/bk/mysql-5.0

Merge mysql.com:/home/bkroot/mysql-5.0
into mysql.com:/home/bk/mysql-5.0
478e5da6 · unknown · f940cfad · 711464a1 · 478e5da6 · 478e5da6
Commit 478e5da6 authored Jul 05, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/lowercase_table2.result mysql-test/r/lowercase_table2.result +1 -1

mysql-test/t/lowercase_table2.test mysql-test/t/lowercase_table2.test +1 -1

No files found.
--- a/mysql-test/r/lowercase_table2.result
+++ b/mysql-test/r/lowercase_table2.result
 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";

--- 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);