Skip to content

M
MariaDB
Commit 02ac63c1 authored by unknown's avatar unknown
Browse files
Options

Merge pilot.(none):/data/msvensson/mysql/my51-m-imsuite 

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
parents 59f0a432 b201a6c7
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 44 deletions
mysql-test/suite/im/t/disabled.def 0 → 100644
View file @ 02ac63c1
##############################################################################
#
# List the test cases that are to be disabled temporarily.
#
# Separate the test case name and the comment with ':'.
#
# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
#
# Do not use any TAB characters for whitespace.
#
##############################################################################
im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly
im_daemon_life_cycle : Bug#20294 2007-05-14 alik Instance manager tests fail randomly
im_cmd_line : Bug#20294 2007-05-14 alik Instance manager tests fail randomly
im_utils : Bug#20294 2007-05-30 alik Instance manager tests fail randomly
im_instance_conf : Bug#20294 2007-05-30 alik Instance manager tests fail randomly
im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance.
im_instance_conf : BUG#28743 Instance manager generates warnings in test suite
im_utils : BUG#28743 Instance manager generates warnings in test suite
mysql-test/t/im_cmd_line.imtest → mysql-test/suite/im/t/im_cmd_line.imtest
View file @ 02ac63c1
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
########################################################################### ###########################################################################
--source include/im_check_env.inc --source suite/im/t/im_check_env.inc
########################################################################### ###########################################################################
......
mysql-test/t/im_daemon_life_cycle.imtest → mysql-test/suite/im/t/im_daemon_life_cycle.imtest
View file @ 02ac63c1
let $UTIL=$MYSQL_TEST_DIR/suite/im/t;
########################################################################### ###########################################################################
# #
# This file contains test for (1.2) test suite. # This file contains test for (1.2) test suite.
...@@ -6,11 +8,11 @@ ...@@ -6,11 +8,11 @@
# #
########################################################################### ###########################################################################
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle im_daemon_life_cycle.imtest started. --exec $UTIL/log.sh im_daemon_life_cycle im_daemon_life_cycle.imtest started.
########################################################################### ###########################################################################
--source include/im_check_env.inc --source suite/im/t/im_check_env.inc
# Turn on reconnect, not on by default anymore. # Turn on reconnect, not on by default anymore.
--enable_reconnect --enable_reconnect
...@@ -30,15 +32,15 @@ ...@@ -30,15 +32,15 @@
# #
########################################################################### ###########################################################################
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Main-test: starting... --exec $UTIL/log.sh im_daemon_life_cycle Main-test: starting...
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Killing IM-main... --exec $UTIL/log.sh im_daemon_life_cycle Killing IM-main...
--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle --exec $UTIL/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections... --exec $UTIL/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections...
--exec $MYSQL_TEST_DIR/t/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle --exec $UTIL/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Main-test: done. --exec $UTIL/log.sh im_daemon_life_cycle Main-test: done.
########################################################################### ###########################################################################
# #
...@@ -55,29 +57,29 @@ ...@@ -55,29 +57,29 @@
--echo -- Test for BUG#12751 --echo -- Test for BUG#12751
--echo -------------------------------------------------------------------- --echo --------------------------------------------------------------------
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle BUG12751: starting... --exec $UTIL/log.sh im_daemon_life_cycle BUG12751: starting...
# 1. Start mysqld; # 1. Start mysqld;
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: starting... --exec $UTIL/log.sh im_daemon_life_cycle mysqld2: starting...
START INSTANCE mysqld2; START INSTANCE mysqld2;
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: waiting to start... --exec $UTIL/log.sh im_daemon_life_cycle mysqld2: waiting to start...
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 started im_daemon_life_cycle --exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 started im_daemon_life_cycle
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: started. --exec $UTIL/log.sh im_daemon_life_cycle mysqld2: started.
# 2. Restart IM-main; # 2. Restart IM-main;
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Killing IM-main... --exec $UTIL/log.sh im_daemon_life_cycle Killing IM-main...
--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle --exec $UTIL/kill_n_check.sh $IM_PATH_PID restarted 55 im_daemon_life_cycle
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections... --exec $UTIL/log.sh im_daemon_life_cycle Waiting for IM-main to start accepting connections...
--exec $MYSQL_TEST_DIR/t/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle --exec $UTIL/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 55 im_daemon_life_cycle
# 3. Issue some statement -- connection should be re-established. # 3. Issue some statement -- connection should be re-established.
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle Checking that IM-main processing commands... --exec $UTIL/log.sh im_daemon_life_cycle Checking that IM-main processing commands...
--replace_column 2 STATE 3 VERSION_NUMBER 4 VERSION --replace_column 2 STATE 3 VERSION_NUMBER 4 VERSION
SHOW INSTANCE STATUS mysqld1; SHOW INSTANCE STATUS mysqld1;
...@@ -86,13 +88,13 @@ SHOW INSTANCE STATUS mysqld1; ...@@ -86,13 +88,13 @@ SHOW INSTANCE STATUS mysqld1;
# So, if it we do not stop it, it will be stopped by mysql-test-run.pl with # So, if it we do not stop it, it will be stopped by mysql-test-run.pl with
# warning. # warning.
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: stopping... --exec $UTIL/log.sh im_daemon_life_cycle mysqld2: stopping...
STOP INSTANCE mysqld2; STOP INSTANCE mysqld2;
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: waiting to stop... --exec $UTIL/log.sh im_daemon_life_cycle mysqld2: waiting to stop...
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 stopped im_daemon_life_cycle --exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 55 stopped im_daemon_life_cycle
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle mysqld2: stopped. --exec $UTIL/log.sh im_daemon_life_cycle mysqld2: stopped.
########################################################################### ###########################################################################
--exec $MYSQL_TEST_DIR/t/log.sh im_daemon_life_cycle BUG12751: done. --exec $UTIL/log.sh im_daemon_life_cycle BUG12751: done.
mysql-test/t/im_instance_conf.imtest → mysql-test/suite/im/t/im_instance_conf.imtest
View file @ 02ac63c1
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# #
########################################################################### ###########################################################################
--source include/im_check_env.inc --source suite/im/t/im_check_env.inc
########################################################################### ###########################################################################
# #
......
mysql-test/t/im_life_cycle.imtest → mysql-test/suite/im/t/im_life_cycle.imtest
View file @ 02ac63c1
let $UTIL=$MYSQL_TEST_DIR/suite/im/t;
########################################################################### ###########################################################################
# #
# This file contains test for (1.1) test suite. # This file contains test for (1.1) test suite.
...@@ -6,7 +8,7 @@ ...@@ -6,7 +8,7 @@
# #
########################################################################### ###########################################################################
--source include/im_check_env.inc --source suite/im/t/im_check_env.inc
########################################################################### ###########################################################################
# #
...@@ -25,7 +27,7 @@ ...@@ -25,7 +27,7 @@
START INSTANCE mysqld2; START INSTANCE mysqld2;
# FIXME: START INSTANCE should be synchronous. # FIXME: START INSTANCE should be synchronous.
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle --exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle
# FIXME: Result of SHOW INSTANCES here is not deterministic unless START # FIXME: Result of SHOW INSTANCES here is not deterministic unless START
# INSTANCE is synchronous. Even waiting for mysqld to start by looking at # INSTANCE is synchronous. Even waiting for mysqld to start by looking at
...@@ -58,7 +60,7 @@ SHOW VARIABLES LIKE 'port'; ...@@ -58,7 +60,7 @@ SHOW VARIABLES LIKE 'port';
STOP INSTANCE mysqld2; STOP INSTANCE mysqld2;
# FIXME: STOP INSTANCE should be synchronous. # FIXME: STOP INSTANCE should be synchronous.
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_life_cycle --exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_life_cycle
# FIXME: Result of SHOW INSTANCES here is not deterministic unless START # FIXME: Result of SHOW INSTANCES here is not deterministic unless START
# INSTANCE is synchronous. Even waiting for mysqld to start by looking at # INSTANCE is synchronous. Even waiting for mysqld to start by looking at
...@@ -121,7 +123,7 @@ STOP INSTANCE mysqld3; ...@@ -121,7 +123,7 @@ STOP INSTANCE mysqld3;
--echo -- 1.1.6. --echo -- 1.1.6.
--echo -------------------------------------------------------------------- --echo --------------------------------------------------------------------
--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD1_PATH_PID restarted 30 im_life_cycle --exec $UTIL/kill_n_check.sh $IM_MYSQLD1_PATH_PID restarted 30 im_life_cycle
# Give some time to IM to detect that mysqld was restarted. It should be # Give some time to IM to detect that mysqld was restarted. It should be
# longer than monitoring interval. # longer than monitoring interval.
...@@ -143,7 +145,7 @@ SHOW INSTANCES; ...@@ -143,7 +145,7 @@ SHOW INSTANCES;
START INSTANCE mysqld2; START INSTANCE mysqld2;
# FIXME: START INSTANCE should be synchronous. # FIXME: START INSTANCE should be synchronous.
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle --exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_life_cycle
# FIXME: Result of SHOW INSTANCES here is not deterministic unless START # FIXME: Result of SHOW INSTANCES here is not deterministic unless START
# INSTANCE is synchronous. Even waiting for mysqld to start by looking at # INSTANCE is synchronous. Even waiting for mysqld to start by looking at
...@@ -151,7 +153,7 @@ START INSTANCE mysqld2; ...@@ -151,7 +153,7 @@ START INSTANCE mysqld2;
# mysqld has started. # mysqld has started.
# SHOW INSTANCES; # SHOW INSTANCES;
--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed 10 im_life_cycle --exec $UTIL/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed 10 im_life_cycle
# FIXME: Result of SHOW INSTANCES here is not deterministic unless START # FIXME: Result of SHOW INSTANCES here is not deterministic unless START
# INSTANCE is synchronous. Even waiting for mysqld to start by looking at # INSTANCE is synchronous. Even waiting for mysqld to start by looking at
......
mysql-test/t/im_options.imtest → mysql-test/suite/im/t/im_options.imtest
View file @ 02ac63c1
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
# #
########################################################################### ###########################################################################
--source include/im_check_env.inc --source suite/im/t/im_check_env.inc
########################################################################### ###########################################################################
# #
......
mysql-test/t/im_utils.imtest → mysql-test/suite/im/t/im_utils.imtest
View file @ 02ac63c1
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
# #
########################################################################### ###########################################################################
--source include/im_check_env.inc --source suite/im/t/im_check_env.inc
let $UTIL=$MYSQL_TEST_DIR/suite/im/t;
########################################################################### ###########################################################################
...@@ -31,10 +33,10 @@ SHOW INSTANCE OPTIONS mysqld2; ...@@ -31,10 +33,10 @@ SHOW INSTANCE OPTIONS mysqld2;
# #
START INSTANCE mysqld2; START INSTANCE mysqld2;
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_utils --exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started im_utils
STOP INSTANCE mysqld2; STOP INSTANCE mysqld2;
--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_utils --exec $UTIL/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped im_utils
# #
# Check 'SHOW LOG FILES' command: # Check 'SHOW LOG FILES' command:
......
mysql-test/t/disabled.def
View file @ 02ac63c1
...@@ -11,15 +11,6 @@ ...@@ -11,15 +11,6 @@
############################################################################## ##############################################################################
user_limits : Bug#23921 random failure of user_limits.test user_limits : Bug#23921 random failure of user_limits.test
im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly
im_daemon_life_cycle : Bug#20294 2007-05-14 alik Instance manager tests fail randomly
im_cmd_line : Bug#20294 2007-05-14 alik Instance manager tests fail randomly
im_utils : Bug#20294 2007-05-30 alik Instance manager tests fail randomly
im_instance_conf : Bug#20294 2007-05-30 alik Instance manager tests fail randomly
im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance.
im_instance_conf : BUG#28743 Instance manager generates warnings in test suite
im_utils : BUG#28743 Instance manager generates warnings in test suite
concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7