From a21ff660953cae4c43b8221926a5f302e205c9c8 Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/june.mysql.com>
Date: Mon, 16 Jul 2007 15:09:46 +0500
Subject: [PATCH] BUG#29807 - innodb_mysql.test: Cannot find table test/t2 from
 the             internal data dictionary - re-enabled innodb_mysql test; -
 added a rule to through away expected warning to mtr_report.pl; - fixed a
 test case to produce unique warning.

mysql-test/include/mix1.inc:
  Modified a test case to through away expected warning.
mysql-test/lib/mtr_report.pl:
  Through away a warning produced by BUG#29807 test.
mysql-test/r/innodb_mysql.result:
  Modified a test case to through away expected warning.
mysql-test/t/disabled.def:
  Re-enabled innodb_mysql.test.
---
 mysql-test/include/mix1.inc      | 10 +++++-----
 mysql-test/lib/mtr_report.pl     |  6 +++++-
 mysql-test/r/innodb_mysql.result | 12 ++++++------
 mysql-test/t/disabled.def        |  1 -
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc
index 11b0013fc38..6a82d2b126c 100644
--- a/mysql-test/include/mix1.inc
+++ b/mysql-test/include/mix1.inc
@@ -677,14 +677,14 @@ DROP TABLE t1,t2,t3;
 #
 
 create table t1 (a int) engine=innodb;
-copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/t2.frm;
+copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/bug29807.frm;
 --error 1146
-select * from t2;
+select * from bug29807;
 drop table t1;
 --error 1051
-drop table t2;
-create table t2 (a int);
-drop table t2;
+drop table bug29807;
+create table bug29807 (a int);
+drop table bug29807;
 
 
 #
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index 317b5b8ba8e..306a0fe5d9d 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -358,7 +358,11 @@ sub mtr_report_stats ($) {
                 # Test case for Bug#14233 produces the following warnings:
                 /Stored routine 'test'.'bug14233_1': invalid value in column mysql.proc/ or
                 /Stored routine 'test'.'bug14233_2': invalid value in column mysql.proc/ or
-                /Stored routine 'test'.'bug14233_3': invalid value in column mysql.proc/
+                /Stored routine 'test'.'bug14233_3': invalid value in column mysql.proc/ or
+
+                # 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/
 	       )
             {
               next;                       # Skip these lines
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index cdea5c49594..a2ed8f6b175 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -666,13 +666,13 @@ SELECT * FROM t3 WHERE a = 'uk';
 a
 DROP TABLE t1,t2,t3;
 create table t1 (a int) engine=innodb;
-select * from t2;
-ERROR 42S02: Table 'test.t2' doesn't exist
+select * from bug29807;
+ERROR 42S02: Table 'test.bug29807' doesn't exist
 drop table t1;
-drop table t2;
-ERROR 42S02: Unknown table 't2'
-create table t2 (a int);
-drop table t2;
+drop table bug29807;
+ERROR 42S02: Unknown table 'bug29807'
+create table bug29807 (a int);
+drop table bug29807;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 CREATE TABLE t2 (a INT) ENGINE=InnoDB;
 switch to connection c1
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index b994561116d..17505cc91b7 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -26,4 +26,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()
 binlog_innodb        : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd
-innodb_mysql         : Bug#29807 2007-07-15 ingo master.err: Cannot find table test/t2 from the internal data dictionary