From 9fff3f5b5c9e1df1dc0832f8b15e7df3c73ec228 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Tue, 30 Jul 2013 17:47:53 +0400 Subject: [PATCH] MDEV-4786 - merge 10.0-monty - 10.0 Fixed innodb.innodb_mysql failure. mysql-test/include/mix1.inc: Applied hunk from 5.6 test: error text has changed during merge. --- mysql-test/include/mix1.inc | 4 +++- mysql-test/suite/innodb/r/innodb_mysql.result | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 15a69fc04ff..0a5b63b4280 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -631,8 +631,10 @@ copy_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/bug29807.frm; select * from bug29807; drop table t1; drop table bug29807; +--disable_query_log call mtr.add_suppression("InnoDB: Error: table .test...bug29807. does not exist in the InnoDB internal"); -call mtr.add_suppression("Cannot find or open table test\/bug29807 from"); +call mtr.add_suppression("InnoDB: Cannot open table test\/bug29807 from"); +--enable_query_log # diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index 236529fd8d6..24228acebc9 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -635,8 +635,6 @@ drop table t1; drop table bug29807; Warnings: Warning 155 Table 'test.bug29807' doesn't exist in engine -call mtr.add_suppression("InnoDB: Error: table .test...bug29807. does not exist in the InnoDB internal"); -call mtr.add_suppression("Cannot find or open table test\/bug29807 from"); CREATE TABLE t1 (a INT) ENGINE=InnoDB; CREATE TABLE t2 (a INT) ENGINE=InnoDB; switch to connection c1