mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
Fix for BUG#20294: Instance manager test im_instance_conf
fails randomly. The problem is that the test was affected by other running test-suites on the same box. The fix affects the test only, no code touched.
This commit is contained in:
anozdrin@mysql.com
parent
cf16c8ec3c
commit
ce8734699b
3 changed files with 96 additions and 39 deletions
|
|
@ -13,7 +13,9 @@ Variable_name Value
|
|||
server_id 1
|
||||
|
||||
---> connection: default
|
||||
CREATE INSTANCE mysqld3;
|
||||
CREATE INSTANCE mysqld3
|
||||
server_id = 3,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld3 offline
|
||||
|
|
@ -22,6 +24,7 @@ mysqld1 online
|
|||
--------------------------------------------------------------------
|
||||
server_id = 1
|
||||
server_id = 2
|
||||
server_id=3
|
||||
--------------------------------------------------------------------
|
||||
CREATE INSTANCE mysqld1;
|
||||
ERROR HY000: Instance already exists
|
||||
|
|
@ -32,7 +35,10 @@ ERROR HY000: Instance already exists
|
|||
--------------------------------------------------------------------
|
||||
nonguarded
|
||||
--------------------------------------------------------------------
|
||||
CREATE INSTANCE mysqld4 nonguarded;
|
||||
CREATE INSTANCE mysqld4
|
||||
nonguarded,
|
||||
server_id = 4,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_4.sock";
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld3 offline
|
||||
|
|
@ -46,7 +52,11 @@ nonguarded
|
|||
--------------------------------------------------------------------
|
||||
--------------------------------------------------------------------
|
||||
--------------------------------------------------------------------
|
||||
CREATE INSTANCE mysqld5 test-A = 000, test-B = test;
|
||||
CREATE INSTANCE mysqld5
|
||||
test-A = 000,
|
||||
test-B = test,
|
||||
server_id = 5,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_5.sock";
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld1 online
|
||||
|
|
@ -61,7 +71,11 @@ test-B=test
|
|||
--------------------------------------------------------------------
|
||||
--------------------------------------------------------------------
|
||||
--------------------------------------------------------------------
|
||||
CREATE INSTANCE mysqld6 test-C1 = 10 , test-C2 = 02 ;
|
||||
CREATE INSTANCE mysqld6
|
||||
test-C1 = 10 ,
|
||||
test-C2 = 02 ,
|
||||
server_id = 6,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_6.sock";
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld1 online
|
||||
|
|
@ -116,7 +130,11 @@ mysqld4 offline
|
|||
--------------------------------------------------------------------
|
||||
--------------------------------------------------------------------
|
||||
--------------------------------------------------------------------
|
||||
CREATE INSTANCE mysqld9 test-1=" hello world ", test-2=' ';
|
||||
CREATE INSTANCE mysqld9
|
||||
test-1=" hello world ",
|
||||
test-2=' ',
|
||||
server_id = 9,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_9.sock";
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld1 online
|
||||
|
|
@ -126,56 +144,67 @@ mysqld6 offline
|
|||
mysqld3 offline
|
||||
mysqld4 offline
|
||||
mysqld9 offline
|
||||
CREATE INSTANCE mysqld9a test-3='\b\babc\sdef';
|
||||
CREATE INSTANCE mysqld10
|
||||
test-3='\b\babc\sdef',
|
||||
server_id = 10,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_10.sock";
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld1 online
|
||||
mysqld9a offline
|
||||
mysqld9 offline
|
||||
mysqld5 offline
|
||||
mysqld6 offline
|
||||
mysqld3 offline
|
||||
mysqld4 offline
|
||||
mysqld9 offline
|
||||
mysqld10 offline
|
||||
mysqld2 offline
|
||||
CREATE INSTANCE mysqld9b test-4='abc\tdef', test-5='abc\ndef';
|
||||
CREATE INSTANCE mysqld11
|
||||
test-4='abc\tdef',
|
||||
test-5='abc\ndef',
|
||||
server_id = 11,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_11.sock";
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld9b offline
|
||||
mysqld9a offline
|
||||
mysqld1 online
|
||||
mysqld11 offline
|
||||
mysqld5 offline
|
||||
mysqld6 offline
|
||||
mysqld3 offline
|
||||
mysqld4 offline
|
||||
mysqld9 offline
|
||||
mysqld10 offline
|
||||
mysqld2 offline
|
||||
mysqld1 online
|
||||
CREATE INSTANCE mysqld9c test-6="abc\rdef", test-7="abc\\def";
|
||||
mysqld9 offline
|
||||
CREATE INSTANCE mysqld12
|
||||
test-6="abc\rdef",
|
||||
test-7="abc\\def",
|
||||
server_id = 12,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_12.sock";
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld9b offline
|
||||
mysqld6 offline
|
||||
mysqld1 online
|
||||
mysqld9 offline
|
||||
mysqld5 offline
|
||||
mysqld9c offline
|
||||
mysqld6 offline
|
||||
mysqld3 offline
|
||||
mysqld4 offline
|
||||
mysqld9 offline
|
||||
mysqld10 offline
|
||||
mysqld2 offline
|
||||
mysqld1 online
|
||||
mysqld9a offline
|
||||
CREATE INSTANCE mysqld10 test-bad=' \ ';
|
||||
mysqld12 offline
|
||||
mysqld11 offline
|
||||
CREATE INSTANCE mysqld13 test-bad=' \ ';
|
||||
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
|
||||
SHOW INSTANCES;
|
||||
instance_name state
|
||||
mysqld9b offline
|
||||
mysqld6 offline
|
||||
mysqld1 online
|
||||
mysqld9 offline
|
||||
mysqld5 offline
|
||||
mysqld9c offline
|
||||
mysqld6 offline
|
||||
mysqld3 offline
|
||||
mysqld4 offline
|
||||
mysqld9 offline
|
||||
mysqld10 offline
|
||||
mysqld2 offline
|
||||
mysqld1 online
|
||||
mysqld9a offline
|
||||
mysqld12 offline
|
||||
mysqld11 offline
|
||||
--------------------------------------------------------------------
|
||||
test-1= hello world
|
||||
--------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
#events_stress : BUG#17619 2006-02-21 andrey Race conditions
|
||||
#events : BUG#17619 2006-02-21 andrey Race conditions
|
||||
#events_scheduling : BUG#19170 2006-04-26 andrey Test case of 19170 fails on some platforms. Has to be checked.
|
||||
im_instance_conf : Bug#20294 2006-06-06 monty Instance manager test im_instance_conf fails randomly
|
||||
im_options : Bug#20294 2006-06-06 monty Instance manager test im_instance_conf fails randomly
|
||||
im_life_cycle : Bug#20368 2006-06-10 alik im_life_cycle test fails
|
||||
#im_instance_conf : Bug#20294 2006-06-06 monty Instance manager test im_instance_conf fails randomly
|
||||
#im_options : Bug#20294 2006-06-06 monty Instance manager test im_instance_conf fails randomly
|
||||
#im_life_cycle : Bug#20368 2006-06-10 alik im_life_cycle test fails
|
||||
ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
|
||||
ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
|
||||
#ndb_binlog_discover : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown
|
||||
|
|
|
|||
|
|
@ -69,7 +69,9 @@ SHOW VARIABLES LIKE 'server_id';
|
|||
# Check that CREATE INSTANCE succeeds for non-existing instance and also check
|
||||
# that both config file and internal configuration cache have been updated.
|
||||
|
||||
CREATE INSTANCE mysqld3;
|
||||
CREATE INSTANCE mysqld3
|
||||
server_id = 3,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
|
||||
|
||||
SHOW INSTANCES;
|
||||
|
||||
|
|
@ -99,7 +101,10 @@ CREATE INSTANCE mysqld3;
|
|||
--exec grep nonguarded $MYSQLTEST_VARDIR/im.cnf;
|
||||
--echo --------------------------------------------------------------------
|
||||
|
||||
CREATE INSTANCE mysqld4 nonguarded;
|
||||
CREATE INSTANCE mysqld4
|
||||
nonguarded,
|
||||
server_id = 4,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_4.sock";
|
||||
|
||||
SHOW INSTANCES;
|
||||
|
||||
|
|
@ -115,7 +120,11 @@ SHOW INSTANCES;
|
|||
--exec grep test-B $MYSQLTEST_VARDIR/im.cnf || true;
|
||||
--echo --------------------------------------------------------------------
|
||||
|
||||
CREATE INSTANCE mysqld5 test-A = 000, test-B = test;
|
||||
CREATE INSTANCE mysqld5
|
||||
test-A = 000,
|
||||
test-B = test,
|
||||
server_id = 5,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_5.sock";
|
||||
|
||||
SHOW INSTANCES;
|
||||
|
||||
|
|
@ -135,7 +144,11 @@ SHOW INSTANCES;
|
|||
--exec grep test-C $MYSQLTEST_VARDIR/im.cnf || true;
|
||||
--echo --------------------------------------------------------------------
|
||||
|
||||
CREATE INSTANCE mysqld6 test-C1 = 10 , test-C2 = 02 ;
|
||||
CREATE INSTANCE mysqld6
|
||||
test-C1 = 10 ,
|
||||
test-C2 = 02 ,
|
||||
server_id = 6,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_6.sock";
|
||||
|
||||
SHOW INSTANCES;
|
||||
|
||||
|
|
@ -183,22 +196,37 @@ SHOW INSTANCES;
|
|||
--exec grep test-4 $MYSQLTEST_VARDIR/im.cnf || true;
|
||||
--echo --------------------------------------------------------------------
|
||||
|
||||
CREATE INSTANCE mysqld9 test-1=" hello world ", test-2=' ';
|
||||
CREATE INSTANCE mysqld9
|
||||
test-1=" hello world ",
|
||||
test-2=' ',
|
||||
server_id = 9,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_9.sock";
|
||||
SHOW INSTANCES;
|
||||
|
||||
CREATE INSTANCE mysqld9a test-3='\b\babc\sdef';
|
||||
CREATE INSTANCE mysqld10
|
||||
test-3='\b\babc\sdef',
|
||||
server_id = 10,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_10.sock";
|
||||
# test-3='abc def'
|
||||
SHOW INSTANCES;
|
||||
|
||||
CREATE INSTANCE mysqld9b test-4='abc\tdef', test-5='abc\ndef';
|
||||
CREATE INSTANCE mysqld11
|
||||
test-4='abc\tdef',
|
||||
test-5='abc\ndef',
|
||||
server_id = 11,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_11.sock";
|
||||
SHOW INSTANCES;
|
||||
|
||||
CREATE INSTANCE mysqld9c test-6="abc\rdef", test-7="abc\\def";
|
||||
CREATE INSTANCE mysqld12
|
||||
test-6="abc\rdef",
|
||||
test-7="abc\\def",
|
||||
server_id = 12,
|
||||
socket = "$MYSQL_TMP_DIR/mysqld_12.sock";
|
||||
# test-6=abc
|
||||
SHOW INSTANCES;
|
||||
|
||||
--error ER_SYNTAX_ERROR
|
||||
CREATE INSTANCE mysqld10 test-bad=' \ ';
|
||||
CREATE INSTANCE mysqld13 test-bad=' \ ';
|
||||
SHOW INSTANCES;
|
||||
|
||||
--echo --------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue