bzr commit into mysql-5.1-bugteam branch (patrick.crews:2797) Bug#32667

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/lowercase/mysql-5.1-bugteam/ based on
revid:davi.arnaut@stripped

 2797 Patrick Crews	2009-02-13
      BUG#32667: lowercase_table3.test reports to error log
      
      Cleaned up SQL code in the test.
      Needed to move the FLUSH TABLES statement prior to the DROP TABLE t1 to prevent a
warning of
      Table open on delete and a test fail.
modified:
  mysql-test/r/lowercase_table3.result
  mysql-test/t/lowercase_table3.test

=== modified file 'mysql-test/r/lowercase_table3.result'
--- a/mysql-test/r/lowercase_table3.result	2008-11-14 15:36:33 +0000
+++ b/mysql-test/r/lowercase_table3.result	2009-02-13 21:12:59 +0000
@@ -1,11 +1,11 @@
-call mtr.add_suppression("Cannot find or open table test/BUG29839 from");
+call mtr.add_suppression("Cannot find or open table test/BUG29839 from .*");
 DROP TABLE IF EXISTS t1,T1;
-CREATE TABLE t1 (a int);
-SELECT * from T1;
+CREATE TABLE t1 (a INT);
+SELECT * FROM T1;
 a
-drop table t1;
-flush tables;
-CREATE TABLE bug29839 (a int) ENGINE=INNODB;
-SELECT * from BUG29839;
+FLUSH TABLES;
+DROP TABLE t1;
+CREATE TABLE bug29839 (a INT) ENGINE=INNODB;
+SELECT * FROM BUG29839;
 ERROR 42S02: Table 'test.BUG29839' doesn't exist
-drop table bug29839;
+DROP TABLE bug29839;

=== modified file 'mysql-test/t/lowercase_table3.test'
--- a/mysql-test/t/lowercase_table3.test	2008-10-13 18:33:08 +0000
+++ b/mysql-test/t/lowercase_table3.test	2009-02-13 21:12:59 +0000
@@ -9,7 +9,7 @@
 --source include/have_case_insensitive_file_system.inc
 --source include/not_windows.inc
 
-call mtr.add_suppression("Cannot find or open table test/BUG29839 from");
+call mtr.add_suppression("Cannot find or open table test/BUG29839 from .*");
 
 --disable_warnings
 DROP TABLE IF EXISTS t1,T1;
@@ -18,11 +18,10 @@ DROP TABLE IF EXISTS t1,T1;
 #
 # This is actually an error, but ok as the user has forced this
 # by using --lower-case-table-names=0
-
-CREATE TABLE t1 (a int);
-SELECT * from T1;
-drop table t1;
-flush tables;
+CREATE TABLE t1 (a INT);
+SELECT * FROM T1;
+FLUSH TABLES;
+DROP TABLE t1;
 
 #
 # InnoDB should in this case be case sensitive
@@ -30,9 +29,9 @@ flush tables;
 # storing things in lower case.
 #
 
-CREATE TABLE bug29839 (a int) ENGINE=INNODB;
---error 1146
-SELECT * from BUG29839;
-drop table bug29839;
+CREATE TABLE bug29839 (a INT) ENGINE=INNODB;
+--error ER_NO_SUCH_TABLE
+SELECT * FROM BUG29839;
+DROP TABLE bug29839;
 
 # End of 4.1 tests