Commit d57163fc authored by unknown's avatar unknown
Browse files

Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-tree 

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


mysql-test/t/disabled.def:
  SCCS merged
parents 16de51bc f5e8d19f

mysql-test/r/im_instance_conf.result

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ test-B=test 
--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

CREATE INSTANCE mysqld6

test-C1  =  10  ,

test-C2  =  02  ,
@@ -126,6 +127,9 @@ mysqld4 offline 
--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

CREATE INSTANCE mysqld9

test-1=" hello world ",

test-2='  ',

mysql-test/t/disabled.def

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 
#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-07-24 stewart   Instance manager test im_instance_conf fails randomly

im_options                : Bug#20294 2006-07-24 stewart   Instance manager test im_options 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

mysql-test/t/im_instance_conf.imtest

+35 −27
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
# Check that the configuration file contains only instances that we expect.



--echo --------------------------------------------------------------------

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^server_id[^a-zA-Z0-9_\-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



###########################################################################
@@ -56,7 +56,7 @@ CREATE INSTANCE mysqld3 
SHOW INSTANCES;

 

--echo --------------------------------------------------------------------

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



# Check that CREATE INSTANCE fails for existing instance. Let's all three
@@ -78,7 +78,7 @@ CREATE INSTANCE mysqld3; 
#   - without values;



--echo --------------------------------------------------------------------

--exec grep '^nonguarded\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep "^nonguarded\$" $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



CREATE INSTANCE mysqld4
@@ -89,15 +89,15 @@ CREATE INSTANCE mysqld4 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep '^nonguarded\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep "^nonguarded\$" $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



#   - with value;



--echo --------------------------------------------------------------------

--exec grep '^test-A\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-A[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-B\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-B[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



CREATE INSTANCE mysqld5
@@ -109,9 +109,9 @@ CREATE INSTANCE mysqld5 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep '^test-A\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-A[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-B\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-B[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



# Check that CREATE INSTANCE parses options and handles grammar errors
@@ -121,7 +121,9 @@ SHOW INSTANCES; 
#   - check handling of extra spaces;



--echo --------------------------------------------------------------------

--exec grep '^test-C\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-C1[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-C2[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



CREATE INSTANCE mysqld6
@@ -133,17 +135,17 @@ CREATE INSTANCE mysqld6 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep '^test-C1\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-C1[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-C2\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-C2[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



#   - check handling of grammar error;



--echo --------------------------------------------------------------------

--exec grep '^test-D\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-D[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-E\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-E[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



--error ER_SYNTAX_ERROR
@@ -159,21 +161,27 @@ CREATE INSTANCE mysqld8 test-F = ; 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep '^test-D\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-D[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-E\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-E[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



#   - check parsing of string option values



--echo --------------------------------------------------------------------

--exec grep '^test-1\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-1[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-2[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-3[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-4[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-2\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-5[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-3\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-6[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^test-4\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-7[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



CREATE INSTANCE mysqld9
@@ -210,21 +218,21 @@ CREATE INSTANCE mysqld13 test-bad=' \ '; 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep '^test-1\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-1[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-2\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-2[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-3\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-3[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-4\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-4[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-5\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-5[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-6\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-6[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-7\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-7[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep '^test-bad\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-bad' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

mysql-test/t/im_options-im.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--monitoring-interval=1

mysql-test/t/im_options.imtest

+24 −24
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
# - check the configuration file;



--echo --------------------------------------------------------------------

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------



# - check the running instances.
@@ -133,25 +133,25 @@ UNSET mysqld2.server_id = 11; 
SET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc = 0010, mysqld3.ddd = 0020;



--echo --------------------------------------------------------------------

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep '^ccc\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^ccc[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep '^ddd\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^ddd[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------



UNSET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc, mysqld3.ddd;



--echo --------------------------------------------------------------------

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^ccc\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^ccc[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^ddd\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^ddd[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



# - check that if some instance name is invalid or the active is active,
@@ -161,22 +161,22 @@ UNSET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc, mysqld3.ddd; 
SET mysqld2.aaa, mysqld3.bbb, mysqld.ccc = 0010;



--echo --------------------------------------------------------------------

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^ccc\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^ccc[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



--error 3015 # ER_INSTANCE_IS_ACTIVE

SET mysqld2.aaa, mysqld3.bbb, mysqld1.ccc = 0010;



--echo --------------------------------------------------------------------

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^ccc\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^ccc[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



# - check that if some instance name is invalid or the active is active,
@@ -186,14 +186,14 @@ SET mysqld2.aaa, mysqld3.bbb, mysqld1.ccc = 0010; 
UNSET mysqld2.server_id, mysqld3.server_id, mysqld.ccc;



--echo --------------------------------------------------------------------

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



--error 3015 # ER_INSTANCE_IS_ACTIVE

UNSET mysqld2.server_id, mysqld3.server_id, mysqld1.ccc;



--echo --------------------------------------------------------------------

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



DROP INSTANCE mysqld3;
@@ -207,21 +207,21 @@ SET mysqld2 . server_id = 222 ; 
SET   mysqld2  .  server_id  =  222  , mysqld2  .  aaa  , mysqld2  .  bbb  ;



--echo --------------------------------------------------------------------

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------



UNSET mysqld2  . aaa  ,  mysqld2  .  bbb ;



--echo --------------------------------------------------------------------

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep "^aaa\$" $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep "^bbb\$" $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



###########################################################################
@@ -235,7 +235,7 @@ UNSET mysqld2 . aaa , mysqld2 . bbb ; 
#     server_id=SERVER_ID for mysqld2);



--echo --------------------------------------------------------------------

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id[^a-zA-Z0-9_-]' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------



#   - (for mysqld1) check that the running instance has not been affected: