diff options
| author | unknown <monty@donna.mysql.fi> | 2001-03-11 21:20:15 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-03-11 21:20:15 +0200 |
| commit | 97acb7b3d17dc60f6b879044aa53b7f422f553c2 (patch) | |
| tree | 3ffab1dce3f9b12f0d98de2289a2022d1e7f3327 /mysql-test | |
| parent | 74ea7333032ebc1d396f1939fd5a84c7a6ecc50c (diff) | |
| download | mariadb-git-97acb7b3d17dc60f6b879044aa53b7f422f553c2.tar.gz | |
Added new tests to benchmark suite
Docs/manual.texi:
Updated some typos in the innobase section
client/mysql.cc:
Added print of field types (for debugging)
client/mysqladmin.c:
Added timeout for shutdown
mysql-test/mysql-test-run.sh:
Use timeout for shutdown
sql-bench/test-select.sh:
Added test of query cache and new tests for count(distinct)
sql/ha_myisam.cc:
Don't give warnings for RESTORE TABLE
sql/mysqld.cc:
Added printing of innobase options
sql/sql_lex.cc:
Fixed possible bug when OEM
sql/sql_table.cc:
cleanup
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index fb247000be7..1b7d1c26f30 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -450,14 +450,14 @@ stop_slave () { if [ x$SLAVE_RUNNING = x1 ] then - $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root shutdown + $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O shutdown_timeout=10 shutdown if [ $? != 0 ] && [ -f $SLAVE_MYPID ] then # try harder! $ECHO "slave not cooperating with mysqladmin, will try manual kill" kill `$CAT $SLAVE_MYPID` sleep $SLEEP_TIME if [ -f $SLAVE_MYPID ] ; then - $ECHO "slave refused to die, resorting to SIGKILL murder" + $ECHO "slave refused to die. Sending SIGKILL" kill -9 `$CAT $SLAVE_MYPID` $RM -f $SLAVE_MYPID else @@ -472,14 +472,14 @@ stop_master () { if [ x$MASTER_RUNNING = x1 ] then - $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root shutdown + $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O shutdown_timeout=10 shutdown if [ $? != 0 ] && [ -f $MASTER_MYPID ] then # try harder! $ECHO "master not cooperating with mysqladmin, will try manual kill" kill `$CAT $MASTER_MYPID` sleep $SLEEP_TIME if [ -f $MASTER_MYPID ] ; then - $ECHO "master refused to die, resorting to SIGKILL murder" + $ECHO "master refused to die. Sending SIGKILL" kill -9 `$CAT $MASTER_MYPID` $RM -f $MASTER_MYPID else |