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

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

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