diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/lib/mtr_report.pl | 14 | ||||
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/include/rpl_mixed_dml.inc | 4 | ||||
| -rw-r--r-- | mysql-test/t/innodb_mysql.test | 3 |
4 files changed, 16 insertions, 7 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 7cd6c1362b3..5d4cb65776f 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -234,6 +234,7 @@ sub mtr_report_stats ($) { "\\[ERROR\\]", "^Error:", "^==.* at 0x", "InnoDB: Warning", + "InnoDB: Error", "^safe_mutex:", "missing DBUG_RETURN", "mysqld: Warning", @@ -335,15 +336,20 @@ sub mtr_report_stats ($) { /\QError in Log_event::read_log_event(): 'Sanity check failed', data_len: 258, event_type: 49\E/ or /Statement is not safe to log in statement format/ or + # test case for Bug#bug29807 copies a stray frm into database + /InnoDB: Error: table `test`.`bug29807` does not exist in the InnoDB internal/ or + /Cannot find table test\/bug29807 from the internal data dictionary/ or + + # innodb foreign key tests that fail in ALTER or RENAME produce this + /InnoDB: Error: in ALTER TABLE `test`.`t[12]`/ or + /InnoDB: Error: in RENAME TABLE table `test`.`t1`/ or + /InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal/ or + # 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/ 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/ 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/ diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index 44d874ef018..37ad9df652b 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -1,3 +1,5 @@ +set global innodb_support_xa=default; +set session innodb_support_xa=default; SET SESSION STORAGE_ENGINE = InnoDB; drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4; drop procedure if exists p1; diff --git a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc index 96dfdbed541..e210ccd907f 100644 --- a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc +++ b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc @@ -51,9 +51,9 @@ DELETE FROM t2 WHERE a = 2; --echo --echo ******************** LOAD DATA INFILE ******************** ---exec cp ./suite/rpl/data/rpl_mixed.dat $MYSQLTEST_VARDIR/tmp/ +--copy_file ./suite/rpl/data/rpl_mixed.dat $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat LOAD DATA INFILE '../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; ---exec rm $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat +--remove_file $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat SELECT * FROM t1; --source suite/rpl/include/rpl_mixed_check_select.inc --source suite/rpl/include/rpl_mixed_clear_tables.inc diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test index 93495538141..a907866f726 100644 --- a/mysql-test/t/innodb_mysql.test +++ b/mysql-test/t/innodb_mysql.test @@ -10,5 +10,6 @@ let $engine_type= InnoDB; let $other_engine_type= MEMORY; # InnoDB does support FOREIGN KEYFOREIGN KEYs let $test_foreign_keys= 1; - +set global innodb_support_xa=default; +set session innodb_support_xa=default; --source include/mix1.inc |