List:Commits« Previous MessageNext Message »
From:Sergey Vojtovich Date:July 16 2007 10:09am
Subject:bk commit into 5.1 tree (svoj:1.2553) BUG#29807
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-16 15:09:46+05:00, svoj@stripped +4 -0
  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@stripped, 2007-07-16 15:09:43+05:00, svoj@stripped +5 -5
    Modified a test case to through away expected warning.

  mysql-test/lib/mtr_report.pl@stripped, 2007-07-16 15:09:43+05:00, svoj@stripped +5 -1
    Through away a warning produced by BUG#29807 test.

  mysql-test/r/innodb_mysql.result@stripped, 2007-07-16 15:09:43+05:00, svoj@stripped +6 -6
    Modified a test case to through away expected warning.

  mysql-test/t/disabled.def@stripped, 2007-07-16 15:09:43+05:00, svoj@stripped +0 -1
    Re-enabled innodb_mysql.test.

diff -Nrup a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc
--- a/mysql-test/include/mix1.inc	2007-07-08 03:30:25 +05:00
+++ b/mysql-test/include/mix1.inc	2007-07-16 15:09:43 +05:00
@@ -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 -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl	2007-07-14 22:35:37 +05:00
+++ b/mysql-test/lib/mtr_report.pl	2007-07-16 15:09:43 +05:00
@@ -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 -Nrup a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
--- a/mysql-test/r/innodb_mysql.result	2007-07-08 03:27:10 +05:00
+++ b/mysql-test/r/innodb_mysql.result	2007-07-16 15:09:43 +05:00
@@ -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 -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2007-07-15 21:47:54 +05:00
+++ b/mysql-test/t/disabled.def	2007-07-16 15:09:43 +05:00
@@ -26,4 +26,3 @@ ctype_big5               : BUG#26711 200
 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
Thread
bk commit into 5.1 tree (svoj:1.2553) BUG#29807Sergey Vojtovich16 Jul
  • Re: bk commit into 5.1 tree (svoj:1.2553) BUG#29807Konstantin Osipov17 Jul