Fix for BUG#21247: im_instance_conf.imtest fails on trees with test-1

in their name.

The problem was that IM-tests contained grep-statements with too wide
patterns. The fix is to make these patterns more restrictive. Only IM-tests
have been fixed, no code has been touched. 


mysql-test/t/im_instance_conf.imtest:
  Use more restrictive pattern.
mysql-test/t/im_options.imtest:
  Use more restrictive pattern.

mysql-test/t/im_instance_conf.imtest

@@ -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\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
 
 # Check that mysqld1 is reported as running.
@@ -79,7 +79,7 @@ CREATE INSTANCE mysqld3
 SHOW INSTANCES;
  
 --echo --------------------------------------------------------------------
---exec grep server_id $MYSQLTEST_VARDIR/im.cnf ;
+--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
 
 # Check that CREATE INSTANCE fails for existing instance. Let's all three
@@ -101,7 +101,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
@@ -112,15 +112,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\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
---exec grep test-B $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-B\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
 
 CREATE INSTANCE mysqld5
@@ -132,9 +132,9 @@ CREATE INSTANCE mysqld5
 SHOW INSTANCES;
 
 --echo --------------------------------------------------------------------
---exec grep test-A $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-A\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
---exec grep test-B $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-B\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
 
 # Check that CREATE INSTANCE parses options and handles grammar errors
@@ -144,7 +144,7 @@ SHOW INSTANCES;
 #   - check handling of extra spaces;
 
 --echo --------------------------------------------------------------------
---exec grep test-C $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-C\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
 
 CREATE INSTANCE mysqld6
@@ -156,17 +156,17 @@ CREATE INSTANCE mysqld6
 SHOW INSTANCES;
 
 --echo --------------------------------------------------------------------
---exec grep test-C1 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-C1\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
---exec grep test-C2 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-C2\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
 
 #   - check handling of grammar error;
 
 --echo --------------------------------------------------------------------
---exec grep test-D $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-D\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
---exec grep test-E $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-E\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
 
 --error ER_SYNTAX_ERROR
@@ -182,21 +182,21 @@ CREATE INSTANCE mysqld8  test-F  =  ;
 SHOW INSTANCES;
 
 --echo --------------------------------------------------------------------
---exec grep test-D $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-D\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
---exec grep test-E $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-E\>' $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\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
---exec grep test-2 $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-2\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
---exec grep test-3 $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-3\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
---exec grep test-4 $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^test-4\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
 
 CREATE INSTANCE mysqld9
@@ -233,21 +233,21 @@ CREATE INSTANCE mysqld13 test-bad=' \ ';
 SHOW INSTANCES;
 
 --echo --------------------------------------------------------------------
---exec grep test-1 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-1\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
---exec grep test-2 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-2\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
---exec grep test-3 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-3\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
---exec grep test-4 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-4\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
---exec grep test-5 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-5\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
---exec grep test-6 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-6\>' $MYSQLTEST_VARDIR/im.cnf;
 --echo --------------------------------------------------------------------
---exec grep test-7 $MYSQLTEST_VARDIR/im.cnf;
+--exec grep '^test-7\>' $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.imtest

@@ -43,7 +43,7 @@
 # - check the configuration file;
 
 --echo --------------------------------------------------------------------
---exec grep server_id $MYSQLTEST_VARDIR/im.cnf ;
+--exec grep '^server_id\>' $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\>' $MYSQLTEST_VARDIR/im.cnf ;
 --echo --------------------------------------------------------------------
---exec grep ddd $MYSQLTEST_VARDIR/im.cnf ;
+--exec grep '^ddd\>' $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\>' $MYSQLTEST_VARDIR/im.cnf || true;
 --echo --------------------------------------------------------------------
---exec grep ddd $MYSQLTEST_VARDIR/im.cnf || true;
+--exec grep '^ddd\>' $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\>' $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\>' $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\>' $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\>' $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\>' $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\>' $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\>' $MYSQLTEST_VARDIR/im.cnf ;
 --echo --------------------------------------------------------------------
 
 #   - (for mysqld1) check that the running instance has not been affected: