From 09241387bdcf945ae9fc80fd8030a8154822fa8c Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Thu, 5 Aug 2010 12:28:19 +0300
Subject: [PATCH] Fixed test failures (bugs in test suite)

mysql-test/suite/percona/percona_log_slow_slave_statements.test:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-control_global_slow.result:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.result:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.result:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-long_query_time.result:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-long_query_time.test:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.result:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.result:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.result:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test:
  Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac)
mysql-test/suite/rpl/r/rpl_stm_until.result:
  Updated results
mysql-test/suite/rpl/t/rpl_stm_until.test:
  Fixed random failure in test suite: master could be reading data from master-bin.00001 at the same time as test suite was changing it.
---
 .../suite/percona/percona_log_slow_slave_statements.test  | 8 ++++----
 .../percona_slow_query_log-control_global_slow.result     | 2 +-
 .../percona_slow_query_log-control_global_slow.test       | 2 +-
 .../percona/percona_slow_query_log-log_slow_filter.result | 2 +-
 .../percona/percona_slow_query_log-log_slow_filter.test   | 2 +-
 .../percona_slow_query_log-log_slow_verbosity.result      | 2 +-
 .../percona_slow_query_log-log_slow_verbosity.test        | 2 +-
 .../percona/percona_slow_query_log-long_query_time.result | 2 +-
 .../percona/percona_slow_query_log-long_query_time.test   | 2 +-
 ...a_slow_query_log-microseconds_in_slow_query_log.result | 4 ++--
 ...ona_slow_query_log-microseconds_in_slow_query_log.test | 4 ++--
 .../percona_slow_query_log-min_examined_row_limit.result  | 2 +-
 .../percona_slow_query_log-min_examined_row_limit.test    | 2 +-
 ...rcona_slow_query_log-use_global_long_query_time.result | 2 +-
 ...percona_slow_query_log-use_global_long_query_time.test | 2 +-
 mysql-test/suite/rpl/r/rpl_stm_until.result               | 3 ++-
 mysql-test/suite/rpl/t/rpl_stm_until.test                 | 7 ++++++-
 17 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/mysql-test/suite/percona/percona_log_slow_slave_statements.test b/mysql-test/suite/percona/percona_log_slow_slave_statements.test
index 10a030616c6..37cb1ad2419 100644
--- a/mysql-test/suite/percona/percona_log_slow_slave_statements.test
+++ b/mysql-test/suite/percona/percona_log_slow_slave_statements.test
@@ -126,10 +126,10 @@ let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
 -- echo # Analyse master slow_query_log
 let $i=7;
 let $k=1;
-let $cmd=cat $MASTER_DATADIR/percona_log_slow_slave_statements-master.log | grep;
+let $cmd=cat $MASTER_DATADIR/percona_log_slow_slave_statements-master.log | grep -c;
 while($i)
 {
-    let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
+    let $current_cmd = $cmd "INSERT INTO t VALUES ($k)";
     exec $current_cmd;
     dec $i;
     inc $k;
@@ -138,10 +138,10 @@ while($i)
 -- echo # Analyse slave slow_query_log
 let $i=7;
 let $k=1;
-let $cmd=cat $SLAVE_DATADIR/percona_log_slow_slave_statements-slave.log | grep;
+let $cmd=cat $SLAVE_DATADIR/percona_log_slow_slave_statements-slave.log | grep -c;
 while($i)
 {
-    let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
+    let $current_cmd = $cmd "INSERT INTO t VALUES ($k)";
     exec $current_cmd;
     dec $i;
     inc $k;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.result b/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.result
index ced47a700f7..bc6ce100b35 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.result
+++ b/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.result
@@ -8,5 +8,5 @@ sleep(2)
 0
 set global use_global_log_slow_control=none;
 set global log_slow_verbosity=microtime;
-cat MYSQLD_DATADIR/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l
+cat MYSQLD_DATADIR/percona_slow_query_log-control_global_slow.log | grep -c "No InnoDB statistics available for this query"
 1
diff --git a/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test b/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test
index d60a2a83a1c..79b94825821 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test
@@ -6,7 +6,7 @@ SELECT sleep(2);
 set global use_global_log_slow_control=none;
 set global log_slow_verbosity=microtime;
 let $MYSQLD_DATADIR= `select @@datadir`;
-let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l;
+let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-control_global_slow.log | grep -c "No InnoDB statistics available for this query";
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 exec echo '$cmd';
 exec $cmd;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.result b/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.result
index da46efb8b63..9c8f69745a7 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.result
+++ b/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.result
@@ -21,5 +21,5 @@ SELECT sleep(2);
 sleep(2)
 0
 drop table if exists t;
-cat MYSQLD_DATADIR/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l
+cat MYSQLD_DATADIR/percona_slow_query_log-log_slow_filter.log | grep -c Query_time
 2
diff --git a/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test b/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test
index e2f9f56ca04..843567ae11a 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test
@@ -27,7 +27,7 @@ drop table if exists t;
 --enable_warnings
 
 let $MYSQLD_DATADIR= `select @@datadir`;
-let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l;
+let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-log_slow_filter.log | grep -c Query_time;
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 exec echo '$cmd';
 exec $cmd;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.result b/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.result
index e2fba41787d..ff42937fa4a 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.result
+++ b/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.result
@@ -5,5 +5,5 @@ set log_slow_verbosity=innodb;
 SELECT sleep(2);
 sleep(2)
 0
-cat MYSQLD_DATADIR/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l
+cat MYSQLD_DATADIR/percona_slow_query_log-log_slow_verbosity.log | grep -c "No InnoDB statistics available for this query"
 1
diff --git a/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test b/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test
index 3a2589a8eb9..62717c4ed6e 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test
@@ -7,7 +7,7 @@ set log_slow_verbosity=innodb;
 SELECT sleep(2);
 
 let $MYSQLD_DATADIR= `select @@datadir`;
-let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l;
+let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-log_slow_verbosity.log | grep -c "No InnoDB statistics available for this query";
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 exec echo '$cmd';
 exec $cmd;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result
index 87881558392..abc9c1d9994 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result
@@ -18,5 +18,5 @@ SELECT sleep(5);
 sleep(5)
 0
 set long_query_time=2;
-cat MYSQLD_DATADIR/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l
+cat MYSQLD_DATADIR/percona_slow_query_log-long_query_time.log | grep -c Query_time
 3
diff --git a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
index 06abf75782f..9c034a75fa8 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
@@ -13,7 +13,7 @@ SELECT sleep(5);
 set long_query_time=2;
 
 let $MYSQLD_DATADIR= `select @@datadir`;
-let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l;
+let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-long_query_time.log | grep -c Query_time;
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 exec echo '$cmd';
 exec $cmd;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.result b/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.result
index 79258fddb41..fbfc954481e 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.result
+++ b/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.result
@@ -6,7 +6,7 @@ SELECT sleep(2);
 sleep(2)
 0
 set global slow_query_log_microseconds_timestamp=OFF;
-cat MYSQLD_DATADIR/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+.[0-9]+' | wc -l
+cat MYSQLD_DATADIR/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E -c '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+.[0-9]+'
 1
-cat MYSQLD_DATADIR/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+' | wc -l
+cat MYSQLD_DATADIR/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E -c '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+'
 2
diff --git a/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test b/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test
index 294f291b292..67bf49400fa 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test
@@ -9,12 +9,12 @@ SELECT sleep(2);
 set global slow_query_log_microseconds_timestamp=OFF;
 
 let $MYSQLD_DATADIR= `select @@datadir`;
-let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+.[0-9]+' | wc -l;
+let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E -c '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+.[0-9]+';
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 exec echo "$cmd";
 exec $cmd;
 
-let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+' | wc -l;
+let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E -c '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+';
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 exec echo "$cmd";
 exec $cmd;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.result b/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.result
index 2032c07966e..32698a59837 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.result
+++ b/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.result
@@ -21,5 +21,5 @@ SELECT sleep(2);
 sleep(2)
 0
 drop table if exists t;
-cat MYSQLD_DATADIR/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l
+cat MYSQLD_DATADIR/percona_slow_query_log-min_examined_row_limit.log | grep -c Query_time
 2
diff --git a/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test b/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test
index c728e38c3b6..28287c4bcb2 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test
@@ -27,7 +27,7 @@ drop table if exists t;
 --enable_warnings
 
 let $MYSQLD_DATADIR= `select @@datadir`;
-let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l;
+let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-min_examined_row_limit.log | grep -c Query_time;
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 exec echo '$cmd';
 exec $cmd;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.result b/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.result
index 60052540faf..759f0636b5c 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.result
+++ b/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.result
@@ -20,5 +20,5 @@ sleep(5)
 0
 set global long_query_time=2;
 set global use_global_long_query_time=0;
-cat MYSQLD_DATADIR/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l
+cat MYSQLD_DATADIR/percona_slow_query_log-use_global_long_query_time.log | grep -c Query_time
 3
diff --git a/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test b/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test
index c025554f0c6..397526fccdd 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test
@@ -15,7 +15,7 @@ set global long_query_time=2;
 set global use_global_long_query_time=0;
 
 let $MYSQLD_DATADIR= `select @@datadir`;
-let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l;
+let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-use_global_long_query_time.log | grep -c Query_time;
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 exec echo '$cmd';
 exec $cmd;
diff --git a/mysql-test/suite/rpl/r/rpl_stm_until.result b/mysql-test/suite/rpl/r/rpl_stm_until.result
index 118d31d78c8..0094c143e38 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_until.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_until.result
@@ -93,8 +93,9 @@ start slave;
 drop table if exists t1;
 Warnings:
 Note	1051	Unknown table 't1'
-flush logs;
 stop slave;
+flush logs;
+flush logs;
 reset slave;
 start slave until master_log_file='master-bin.000001', master_log_pos=294 /* to stop right before DROP */;
 show tables /* t1 must exist */;
diff --git a/mysql-test/suite/rpl/t/rpl_stm_until.test b/mysql-test/suite/rpl/t/rpl_stm_until.test
index ee9501681a1..f5e57ec2bd6 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_until.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_until.test
@@ -196,13 +196,18 @@ sync_with_master;
 
 connection master;
 drop table if exists t1; # there is create table t1 in bug47142_master-bin.000001
+sync_slave_with_master;
+connection slave;
+stop slave;
+connection master;
+
 flush logs;
 let $MYSQLD_DATADIR= `select @@datadir`;
 --remove_file $MYSQLD_DATADIR/master-bin.000001
 --copy_file $MYSQL_TEST_DIR/std_data/bug47142_master-bin.000001 $MYSQLD_DATADIR/master-bin.000001
+flush logs;
 
 connection slave;
-stop slave;
 reset slave;
 start slave until master_log_file='master-bin.000001', master_log_pos=294 /* to stop right before DROP */;
 --source include/wait_for_slave_sql_to_stop.inc