summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorPatrick Crews <patrick.crews@sun.com>2009-02-13 16:12:59 -0500
committerPatrick Crews <patrick.crews@sun.com>2009-02-13 16:12:59 -0500
commitaedef27a85bb21826f35f3ce9e1ff6e1cb471a19 (patch)
treee12114b74b9278945fad594f3b57857aaefadc35 /mysql-test
parente0f56aa9e7ddcf6e5537a33a9c4369247a918e1f (diff)
downloadmariadb-git-aedef27a85bb21826f35f3ce9e1ff6e1cb471a19.tar.gz
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.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/lowercase_table3.result16
-rw-r--r--mysql-test/t/lowercase_table3.test19
2 files changed, 17 insertions, 18 deletions
diff --git a/mysql-test/r/lowercase_table3.result b/mysql-test/r/lowercase_table3.result
index 880a203a15f..1ef7d04bb1d 100644
--- a/mysql-test/r/lowercase_table3.result
+++ b/mysql-test/r/lowercase_table3.result
@@ -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;
diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test
index e71d9029606..4748953fe95 100644
--- a/mysql-test/t/lowercase_table3.test
+++ b/mysql-test/t/lowercase_table3.test
@@ -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