diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-12-05 15:08:09 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-12-05 15:08:09 +0100 |
| commit | 44d3917f7a12756b714ff0deac56cb96a5cf3727 (patch) | |
| tree | 653384669d59f334c865d3f3fc59e3d5ac6c2f2d /mysql-test/include/maria_empty_logs.inc | |
| parent | 45521d9710061fd8a1820a1334cc15d141b89160 (diff) | |
| download | mariadb-git-44d3917f7a12756b714ff0deac56cb96a5cf3727.tar.gz | |
Fix for BUG#41102 "Maria: maria-no-logging.test fails randomly on Win64"
mysql-test/include/maria_empty_logs.inc:
move mysqladmin call to include file for reusal (so that others don't have to hit the same bug in their tests);
this include file additionally waits for disconnection. Reasons for BUG#41102:
- in maria-no-logging.test, we shut down mysqld in maria_empty_logs.inc, remove logs, tell mtr that it can
restart mysqld, then wait for being connected (wait_until_connected_again.inc), then send commands to new mysqld.
- but under Windows "mysqladmin shutdown" does not wait for mysqld to be down, so we accidentally removed logs
while it was shutting down, wait_until_connected_again found that we were connected (because it was shutting
down slowly, connections were not yet broken), sent new commands, and one of them failed because mysqld finally
closed connections.
- the fix is to just wait for disconnection after shutdown.
- in a sense, the catch is the "again" in wait_until_connected_again.inc...
mysql-test/include/mysqladmin_shutdown.inc:
shutdown with mysqladmin AND waiting for shutdown to complete (needed on Windows)
mysql-test/include/wait_until_connected_again.inc:
comment
mysql-test/include/wait_until_disconnected.inc:
script which waits until connection is lost
Diffstat (limited to 'mysql-test/include/maria_empty_logs.inc')
| -rw-r--r-- | mysql-test/include/maria_empty_logs.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/maria_empty_logs.inc b/mysql-test/include/maria_empty_logs.inc index 7e3f2181897..0783020c443 100644 --- a/mysql-test/include/maria_empty_logs.inc +++ b/mysql-test/include/maria_empty_logs.inc @@ -13,7 +13,7 @@ append_file $MYSQLTEST_VARDIR/tmp/master0.expect; wait-maria_empty_logs.inc EOF ---exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= shutdown 2>&1; +--source include/mysqladmin_shutdown.inc if (!$mel_keep_control_file) { |