diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-14 17:11:46 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-14 17:11:46 +0200 |
commit | b5285bd7e201ce522b42d18664f171a4e47f5ecd (patch) | |
tree | 42d039bd0b38e6f53a99aeb8ff8a8ee3e601adf6 /mysql-test/suite/innodb | |
parent | af6eee1fc5c40c73edb65c08d16929ccfdc1f5f0 (diff) | |
download | mariadb-git-b5285bd7e201ce522b42d18664f171a4e47f5ecd.tar.gz |
MDEV-11873 Unnecessary InnoDB warnings upon bootstrap
dict_create_or_check_foreign_constraint_tables(): Change the warning
about the foreign key metadata table creation to a note.
Remove messages after metadata table creation. If the creation fails,
startup will abort with a message. Normally the creation succeeds on
bootstrap, and the messages would only be noise.
Remove the related suppressions from the tests.
Diffstat (limited to 'mysql-test/suite/innodb')
-rw-r--r-- | mysql-test/suite/innodb/include/restart_and_reinit.inc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/mysql-test/suite/innodb/include/restart_and_reinit.inc b/mysql-test/suite/innodb/include/restart_and_reinit.inc index 9df66196edf..b3f7cae6d17 100644 --- a/mysql-test/suite/innodb/include/restart_and_reinit.inc +++ b/mysql-test/suite/innodb/include/restart_and_reinit.inc @@ -6,26 +6,16 @@ source include/not_embedded.inc; --disable_query_log -call mtr.add_suppression("InnoDB: New log files created"); -call mtr.add_suppression("InnoDB: Creating foreign key constraint system tables"); - let $innodb_index_stats = query_get_value(show create table mysql.innodb_index_stats, Create Table, 1); let $innodb_table_stats = query_get_value(show create table mysql.innodb_table_stats, Create Table, 1); let $database=`select database()`; drop table mysql.innodb_index_stats, mysql.innodb_table_stats; -let $_server_id= `SELECT @@server_id`; -let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect; let $datadir= `SELECT @@datadir`; -exec echo "wait" > $_expect_file_name; -shutdown_server; -remove_file $datadir/ib_logfile0; -remove_file $datadir/ib_logfile1; +--source include/shutdown_mysqld.inc +remove_files_wildcard $datadir ib_logfile*; remove_file $datadir/ibdata1; -exec echo "restart" > $_expect_file_name; -enable_reconnect; -source include/wait_until_connected_again.inc; -disable_reconnect; +--source include/start_mysqld.inc --disable_query_log use mysql; |