mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 15:54:37 +01:00
75ed6f1a3b
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-make_win_bin_dist: Auto merged configure.in: Auto merged include/my_global.h: Auto merged include/mysql.h: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/log_tables.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/view.test: Auto merged netware/BUILD/mwenv: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/Makefile.am: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged tests/mysql_client_test.c: Auto merged include/my_time.h: manual merge. mysql-test/mysql-test-run.pl: manual merge. mysql-test/r/ps.result: manual merge. mysql-test/t/disabled.def: manual merge. mysql-test/t/ps.test: manual merge.
69 lines
2 KiB
Text
69 lines
2 KiB
Text
###########################################################################
|
|
#
|
|
# This file contains test for (1.2) test suite.
|
|
#
|
|
# Consult WL#2789 for more information.
|
|
#
|
|
###########################################################################
|
|
|
|
--source include/im_check_env.inc
|
|
|
|
# Turn on reconnect, not on by default anymore
|
|
--enable_reconnect
|
|
|
|
###########################################################################
|
|
|
|
# Kill the IM main process and check that the IM Angel will restart the main
|
|
# process.
|
|
|
|
--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 30
|
|
|
|
###########################################################################
|
|
|
|
# Wait for IM to start accepting connections.
|
|
|
|
--exec $MYSQL_TEST_DIR/t/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 30
|
|
|
|
###########################################################################
|
|
|
|
#
|
|
# BUG#12751: Instance Manager: client hangs
|
|
#
|
|
|
|
--echo
|
|
--echo --------------------------------------------------------------------
|
|
--echo -- Test for BUG#12751
|
|
--echo --------------------------------------------------------------------
|
|
|
|
# Give some time to begin accepting connections after restart.
|
|
# FIXME: race condition here.
|
|
|
|
--sleep 3
|
|
|
|
# 1. Start mysqld;
|
|
|
|
START INSTANCE mysqld2;
|
|
# FIXME: START INSTANCE should be synchronous.
|
|
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started
|
|
|
|
# 2. Restart IM-main: kill it and IM-angel will restart it.
|
|
|
|
--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 30
|
|
|
|
# 3. Issue some statement -- connection should be re-established.
|
|
|
|
# Give some time to begin accepting connections after restart.
|
|
# FIXME: race condition here.
|
|
|
|
--sleep 3
|
|
|
|
--replace_column 3 VERSION_NUMBER 4 VERSION
|
|
SHOW INSTANCE STATUS mysqld1;
|
|
|
|
# 4. Stop mysqld2, because it will not be stopped by IM, as it is nonguarded.
|
|
# So, if it we do not stop it, it will be stopped by mysql-test-run.pl with
|
|
# warning.
|
|
|
|
STOP INSTANCE mysqld2;
|
|
# FIXME: STOP INSTANCE should be synchronous.
|
|
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped
|