database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Add timeout for shutdown to mysql-test-run

Browse Source 
Docs/manual.texi:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Add timeout for shutdown
mysql-test/r/innodb.result:
  Use local test
mysql-test/t/innodb.test:
  merge
This commit is contained in:
unknown
2001-11-07 23:38:33 +02:00
parent 4fdbc4562c bc1ea61467
commit b6287ade89
5 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/mysql-test-run.sh
View File

@ -601,7 +601,7 @@ manager_term()
shift
if [ $USE_MANAGER = 0 ] ; then
$MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$ident.sock -O \
connect_timeout=5 shutdown >/dev/null 2>&1
connect_timeout=5 -O shutdown_timeout=20 shutdown >/dev/null 2>&1
return
fi
$MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT --user=$MYSQL_MANAGER_USER \
@ -1049,8 +1049,8 @@ run_testcase ()
# Ensure that no old mysqld test servers are running
if [ -z "$USE_RUNNING_SERVER" ]
then
$MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O connect_timeout=5 shutdown > /dev/null 2>&1
$MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 shutdown > /dev/null 2>&1
$MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
$MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
$ECHO "Installing Test Databases"
mysql_install_db
start_manager

4
mysql-test/t/innodb.test
View File

@ -489,6 +489,8 @@ insert into t1 values (NULL),(NULL),(NULL);
delete from t1 where a=3;
insert into t1 values (NULL);
select * from t1;
alter table t1 add b int;
select * from t1;
drop table t1;
#Slashdot bug
@ -544,5 +546,3 @@ delete from t1;
select * from t1;
commit;
drop table t1;