database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-4786 - merge 10.0-monty - 10.0

Browse Source 
Fixed innodb.innodb_mysql failure.

mysql-test/include/mix1.inc:
  Applied hunk from 5.6 test: error text has changed during merge.
This commit is contained in:
Sergey Vojtovich
2013-07-30 17:47:53 +04:00
parent 0f985c6407
commit 9fff3f5b5c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/mix1.inc
View File

@ -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
#