4 files changed, 26 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run
index 740f10f1cad..a1adc247ef1 100755
--- a/mysql-test/mysql-test-run
+++ b/mysql-test/mysql-test-run
@@ -147,7 +147,7 @@ echo_pass () {
 prompt_user ()
 {
  echo $1
- read
+ read not_used
 }
 
 echo_fail () {
@@ -285,7 +285,7 @@ start_slave()
 	    --master-connect-retry=1 \
 	    --master-host=127.0.0.1 \
 	    --master-port=$MASTER_MYPORT \
-	    --core-file \
+	    --core-file --log-bin --log-slave-updates \
             --basedir=$CWD \
             --datadir=$SLAVE_MYDDIR \
 	    --pid-file=$SLAVE_MYPID \
@@ -363,7 +363,7 @@ run_testcase ()
  tname=`$ECHO $tname | $CUT -d . -f 1`
  master_opt_file=$TESTDIR/$tname-master.opt
  slave_opt_file=$TESTDIR/$tname-slave.opt
- SKIP_SLAVE=`$EXPR \( match $tname rpl \) = 0`
+ SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
  
  if [ -f $master_opt_file ] ;
  then
diff --git a/mysql-test/r/3.23/mrg000001.dummy.result b/mysql-test/r/3.23/mrg000001.dummy.result
new file mode 100644
index 00000000000..767f92bc2cb
--- /dev/null
+++ b/mysql-test/r/3.23/mrg000001.dummy.result
@@ -0,0 +1 @@
+incr	othr	
diff --git a/mysql-test/r/3.23/mrg000001.result b/mysql-test/r/3.23/mrg000001.result
new file mode 100644
index 00000000000..8b351ebe780
--- /dev/null
+++ b/mysql-test/r/3.23/mrg000001.result
@@ -0,0 +1,5 @@
+incr	othr	
+1	10	
+2	24	
+4	33	
+3	53	
diff --git a/mysql-test/t/3.23/mrg000001.test b/mysql-test/t/3.23/mrg000001.test
new file mode 100644
index 00000000000..ded3ecc8898
--- /dev/null
+++ b/mysql-test/t/3.23/mrg000001.test
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS test1;
+DROP TABLE IF EXISTS test2;
+DROP TABLE IF EXISTS test3;
+
+CREATE TABLE test1 (incr int not null, othr int not null, primary key(incr));
+CREATE TABLE test2 (incr int not null, othr int not null, primary key(incr));
+CREATE TABLE test3 (incr int not null, othr int not null, primary key(incr))
+TYPE=MERGE UNION=(test1,test2);
+
+@r/3.23/mrg000001.dummy.result SELECT * from test3;
+
+INSERT INTO test1 VALUES ( 1,10),( 3,53),( 5,21),( 7,12),( 9,17);
+INSERT INTO test2 VALUES ( 2,24),( 4,33),( 6,41),( 8,26),( 0,32);
+INSERT INTO test1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37);
+INSERT INTO test2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30);
+
+@r/3.23/mrg000001.result SELECT * from test3 where incr in (1,2,3,4) order by othr;