diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
| commit | b170b126b02c2989e68694d6781fb48d4f316363 (patch) | |
| tree | bfc039f3ee09098fe5df5082ba6aaea56ebac313 /mysql-test/include/maria_empty_logs.inc | |
| parent | 41e66d57d5898ea2fa38dfb3a6b47de876efd3c9 (diff) | |
| parent | b4b6494643fa6b0eb96e6af230ab7c47e6ba1be3 (diff) | |
| download | mariadb-git-b170b126b02c2989e68694d6781fb48d4f316363.tar.gz | |
merge with 5.1
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 05ecfc4982c..78a08228caa 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/aria_log.00000020; -- error 0,1 remove_file $MYSQLD_DATADIR/aria_recovery.trace; +--enable_warnings append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; restart-maria_empty_logs.inc |