--do-test option in mysql-test-run - will do only tests that match the pattern

updated rotate event to set new position along with the new log


mysql-test/mysql-test-run.sh:
  added --do-test
mysql-test/r/rpl_log.result:
  update for new rotate event format
sql/log_event.cc:
  rotate event now supports forcing a new position, not just the log
sql/log_event.h:
  clean-up of rotate event, support for position force with rotate event
sql/slave.cc:
  accept position setting from rotate event
sql/sql_repl.cc:
  updates to fake_rotate_event() for the new format

2 files changed, 16 insertions, 6 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index c1f00f00fc2..144a61018ad 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -145,6 +145,7 @@ while test $# -gt 0; do
      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-bdb" ;;
     --skip-rpl) NO_SLAVE=1 ;;
     --skip-test=*) SKIP_TEST=`$ECHO "$1" | $SED -e "s;--skip-test=;;"`;;
+    --do-test=*) DO_TEST=`$ECHO "$1" | $SED -e "s;--do-test=;;"`;;
     --record)
       RECORD=1;
       EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;;
@@ -336,7 +337,7 @@ show_failed_diff ()
   then
     echo "Below are the diffs between actual and expected results:"
     echo "-------------------------------------------------------"
-    $DIFF -c $result_file $reject_file
+    $DIFF -c -a $result_file $reject_file
     echo "-------------------------------------------------------"
     echo "Please follow the instructions outlined at"
     echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html"
@@ -667,7 +668,7 @@ run_testcase ()
  slave_init_script=$TESTDIR/$tname-slave.sh
  slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt
  SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
- if [ -n $SKIP_TEST ] ; then 
+ if [ -n "$SKIP_TEST" ] ; then 
    SKIP_THIS_TEST=`$EXPR \( $tname : "$SKIP_TEST" \) != 0`
    if [ x$SKIP_THIS_TEST = x1 ] ;
    then
@@ -675,6 +676,15 @@ run_testcase ()
    fi
   fi
 
+ if [ -n "$DO_TEST" ] ; then 
+   DO_THIS_TEST=`$EXPR \( $tname : "$DO_TEST" \) != 0`
+   if [ x$DO_THIS_TEST = x0 ] ;
+   then
+    return;
+   fi
+  fi
+
+
  if [ x${NO_SLAVE}x$SKIP_SLAVE = x1x0 ] ;
  then
    USERT="    ...."
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 0ccc948de89..32f90f0711a 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -23,8 +23,8 @@ master-bin.001	263	Query	1	5	use test; drop table t1
 master-bin.001	311	Query	1	6	use test; create table t1 (word char(20) not null)
 master-bin.001	386	Load	1	7	use test; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 FIELDS TERMINATED BY '\t' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
 master-bin.001	468	Query	1	8	use test; drop table t1
-master-bin.001	516	Rotate	1	9	master-bin.002
-master-bin.001	549	Stop	1	10	
+master-bin.001	516	Rotate	1	9	master-bin.002;pos=4
+master-bin.001	557	Stop	1	10	
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
 master-bin.002	4	Start	1	1	Server ver: 4.0.0-debug-log, Binlog ver: 2
 master-bin.002	79	Query	1	2	use test; create table t1 (n int)
@@ -45,8 +45,8 @@ slave-bin.001	253	Query	1	4	use test; insert into t1 values (NULL)
 slave-bin.001	316	Query	1	5	use test; drop table t1
 slave-bin.001	364	Query	1	6	use test; create table t1 (word char(20) not null)
 slave-bin.001	439	Query	1	8	use test; drop table t1
-slave-bin.001	487	Rotate	2	3	slave-bin.002; forced by master
-slave-bin.001	519	Stop	2	4	
+slave-bin.001	487	Rotate	2	3	slave-bin.002;pos=4; forced by master
+slave-bin.001	527	Stop	2	4	
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
 slave-bin.002	4	Start	2	1	Server ver: 4.0.0-debug-log, Binlog ver: 2
 slave-bin.002	79	Slave	2	2	host=127.0.0.1,port=9306,log=master-bin.002,pos=4