summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvoj@mysql.com/june.mysql.com <>2007-07-18 13:55:50 +0500
committersvoj@mysql.com/june.mysql.com <>2007-07-18 13:55:50 +0500
commitb94217491afb463bc16df484f17b0a6e87a780d0 (patch)
treea655dea51b67a46432f1e8a51711fab647176332
parentcb995365fbd4d7d94dafea4dea58b1adb6261c9e (diff)
downloadmariadb-git-b94217491afb463bc16df484f17b0a6e87a780d0.tar.gz
BUG#29839 - lowercase_table3.test: Cannot find table test/T1 from
the internal data dictiona - re-enabled lowercase_table3 test; - added a rule to throw away expected warning to mtr_report.pl; - fixed a test case to produce unique warning.
-rw-r--r--mysql-test/lib/mtr_report.pl6
-rw-r--r--mysql-test/r/lowercase_table3.result8
-rw-r--r--mysql-test/t/disabled.def1
-rw-r--r--mysql-test/t/lowercase_table3.test6
4 files changed, 12 insertions, 9 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index 306a0fe5d9d..fa38e8507f8 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -362,7 +362,11 @@ sub mtr_report_stats ($) {
# BUG#29807 - innodb_mysql.test: Cannot find table test/t2
# from the internal data dictionary
- /Cannot find table test\/bug29807 from the internal data dictionary/
+ /Cannot find table test\/bug29807 from the internal data dictionary/ or
+
+ # BUG#29839 - lowercase_table3.test: Cannot find table test/T1
+ # from the internal data dictiona
+ /Cannot find table test\/BUG29839 from the internal data dictionary/
)
{
next; # Skip these lines
diff --git a/mysql-test/r/lowercase_table3.result b/mysql-test/r/lowercase_table3.result
index 995a2c0d08a..14cff4f98c9 100644
--- a/mysql-test/r/lowercase_table3.result
+++ b/mysql-test/r/lowercase_table3.result
@@ -4,7 +4,7 @@ SELECT * from T1;
a
drop table t1;
flush tables;
-CREATE TABLE t1 (a int) ENGINE=INNODB;
-SELECT * from T1;
-ERROR 42S02: Table 'test.T1' doesn't exist
-drop table t1;
+CREATE TABLE bug29839 (a int) ENGINE=INNODB;
+SELECT * from BUG29839;
+ERROR 42S02: Table 'test.BUG29839' doesn't exist
+drop table bug29839;
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 07c5b4d56a3..9d2b4abc929 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -25,4 +25,3 @@ ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Do
mysql_upgrade : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
federated_innodb : Bug#29522 failed assertion in binlog_close_connection()
-lowercase_table3 : Bug#29839 2007-07-17 ingo Cannot find table test/T1 from the internal data dictionary
diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test
index 75f6e5188c5..51385b4b178 100644
--- a/mysql-test/t/lowercase_table3.test
+++ b/mysql-test/t/lowercase_table3.test
@@ -27,9 +27,9 @@ flush tables;
# storing things in lower case.
#
-CREATE TABLE t1 (a int) ENGINE=INNODB;
+CREATE TABLE bug29839 (a int) ENGINE=INNODB;
--error 1146
-SELECT * from T1;
-drop table t1;
+SELECT * from BUG29839;
+drop table bug29839;
# End of 4.1 tests