diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-09-15 16:01:03 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-09-15 16:01:03 +0300 |
| commit | b4b6494643fa6b0eb96e6af230ab7c47e6ba1be3 (patch) | |
| tree | 3500dd4670fc4ce913f2da0b62a8e209537cb586 /mysql-test/include/maria_empty_logs.inc | |
| parent | b708b872401cc866fd2611f7db13e5888a0a8b3e (diff) | |
| parent | f4820ea62ef2635f2d79476deb001f3ae662470e (diff) | |
| download | mariadb-git-b4b6494643fa6b0eb96e6af230ab7c47e6ba1be3.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test/include/maria_empty_logs.inc')
| -rw-r--r-- | mysql-test/include/maria_empty_logs.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/maria_empty_logs.inc b/mysql-test/include/maria_empty_logs.inc index cc93e214348..e8b6a423953 100644 --- a/mysql-test/include/maria_empty_logs.inc +++ b/mysql-test/include/maria_empty_logs.inc @@ -24,6 +24,7 @@ EOF --source include/mysqladmin_shutdown.inc +--disable_warnings if (!$mel_keep_control_file) { --error 0,1 @@ -73,6 +74,7 @@ remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000020; -- error 0,1 remove_file $MYSQLD_DATADIR/maria_recovery.trace; +--enable_warnings append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; restart-maria_empty_logs.inc |