test case for a coredump on merge tables. Sergei or Monty, can you fix this?

5 files changed, 11 insertions, 7 deletions

diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run
index 111dd0b41cc..2cece3f3312 100755
--- a/mysql-test/mysql-test-run
+++ b/mysql-test/mysql-test-run
@@ -43,6 +43,7 @@ cd ..
 BASEDIR=`pwd`
 cd $CWD
 MYSQL_TEST_DIR=$BASEDIR/mysql-test
+STD_DATA=$MYSQL_TEST_DIR/std_data
   
 TESTDIR="$MYSQL_TEST_DIR/t/"
 TESTSUFFIX=test
@@ -127,6 +128,7 @@ else
  INSTALL_DB="../scripts/install_test_db -bin"
 fi
 
+
 SLAVE_MYSQLD=$MYSQLD #this will be changed later if we are doing gcov
 
 
@@ -394,8 +396,8 @@ mysql_restart () {
 }
 
 mysql_loadstd () {
-
-    #sleep 2
+    
+    cp $STD_DATA/*.frm $STD_DATA/*.MRG $MASTER_MYDDIR/test  
     return 1
 }
 
@@ -506,11 +508,11 @@ then
  [ $res = 1 ] && echo_ok
 fi
 
-#$SETCOLOR_NORMAL && $ECHO -n "Loading Standard Test Database"
-#mysql_loadstd
-#res=$?
-#[ $res != 1 ] && echo_notok && error "Loading STD"
-#[ $res = 1 ] && echo_ok
+$SETCOLOR_NORMAL && $ECHO -n "Loading Standard Test Database"
+mysql_loadstd
+res=$?
+[ x$res != x1 ] && echo_notok && error "Loading STD"
+[ x$res = x1 ] && echo_ok
 
 $SETCOLOR_NORMAL && $ECHO -n "Starting Tests for MySQL $TESTVER Series"
 $SETCOLOR_SUCCESS && echo_ok
diff --git a/mysql-test/r/mrg000002.result b/mysql-test/r/mrg000002.result
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mysql-test/r/mrg000002.result
diff --git a/mysql-test/std_data/m.MRG b/mysql-test/std_data/m.MRG
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mysql-test/std_data/m.MRG
diff --git a/mysql-test/std_data/m.frm b/mysql-test/std_data/m.frm
new file mode 100644
index 00000000000..fc684891d9e
--- /dev/null
+++ b/mysql-test/std_data/m.frm
diff --git a/mysql-test/t/mrg000002.test b/mysql-test/t/mrg000002.test
new file mode 100644
index 00000000000..88da6311cc1
--- /dev/null
+++ b/mysql-test/t/mrg000002.test
@@ -0,0 +1,2 @@
+use test;
+@r/mrg000002.result select * from m;