2 files changed, 27 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 24b62a69b9f..401c0d31c7f 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -139,9 +139,15 @@ while test $# -gt 0; do
       fi
       DO_DDD=1
       ;;
+    --skip-*)
+      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1"
+      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $1"
+      ;;
     --debug)
-      EXTRA_MASTER_MYSQLD_OPT=--debug=d:t:O,$MYSQL_TMP_DIR/master.trace
-      EXTRA_SLAVE_MYSQLD_OPT=--debug=d:t:O,$MYSQL_TMP_DIR/slave.trace
+      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \
+       --debug=d:t:O,$MYSQL_TMP_DIR/master.trace"
+      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \
+       --debug=d:t:O,$MYSQL_TMP_DIR/slave.trace"
       EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --debug"
       ;;
     -- )  shift; break ;;
diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test
index 750ecdeadda..5738f217d01 100644
--- a/mysql-test/t/flush.test
+++ b/mysql-test/t/flush.test
@@ -2,11 +2,24 @@ connect (con1,localhost,root,,test,0,mysql-master.sock);
 connect (con2,localhost,root,,test,0,mysql-master.sock);
 connection con1;
 drop table if exists t1;
-create temporary table t1(n int);
-connection con2;
-#send flush tables;
+create temporary table t1(n int not null primary key);
+drop table if exists t2;
+create table t2(n int);
+insert into t2 values(3);
+let $1=100;
+while ($1)
+{
+ connection con1;
+ send replace into t1 select n from t2;
+ connection con2;
+ send flush tables;
+ connection con1;
+ reap;
+ connection con2;
+ reap;
+ dec $1;
+}
+
 connection con1;
-insert into t1 values(3);
 select * from t1;
-connection con2;
-#reap;
+drop table t2;