diff options
| author | monty@hundin.mysql.fi <> | 2001-11-07 23:18:12 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-07 23:18:12 +0200 |
| commit | 1bc03e8b172102c4198cefadeda1ac49379ea19c (patch) | |
| tree | f1c68494d0547ce79f742d6afdbb72452885ec00 /mysql-test/mysql-test-run.sh | |
| parent | af2e13481ecc4dbae74fa5a4dc4f9d70ec498e39 (diff) | |
| download | mariadb-git-1bc03e8b172102c4198cefadeda1ac49379ea19c.tar.gz | |
Fix bug in ALTER TABLE on a TEMPORARY InnoDB table.
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 9c2cda6108e..de76c6354f5 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -622,7 +622,7 @@ stop_slave () { if [ x$SLAVE_RUNNING = x1 ] then - $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O shutdown_timeout=10 shutdown + $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O shutdown_timeout=20 shutdown if [ $? != 0 ] && [ -f $SLAVE_MYPID ] then # try harder! $ECHO "slave not cooperating with mysqladmin, will try manual kill" @@ -644,7 +644,7 @@ stop_master () { if [ x$MASTER_RUNNING = x1 ] then - $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O shutdown_timeout=10 shutdown + $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O shutdown_timeout=20 shutdown if [ $? != 0 ] && [ -f $MASTER_MYPID ] then # try harder! $ECHO "master not cooperating with mysqladmin, will try manual kill" |