Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp2

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/r/lowercase_table2.result:
  Auto merged

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

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