Commit 6be226bd authored by unknown's avatar unknown

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


mysql-test/mysql-test-run:
  added support for copying tables into datadir - now only MRG and FRM
  files are copied - will add others as we come up with samples
parent 3e2df584
...@@ -43,6 +43,7 @@ cd .. ...@@ -43,6 +43,7 @@ cd ..
BASEDIR=`pwd` BASEDIR=`pwd`
cd $CWD cd $CWD
MYSQL_TEST_DIR=$BASEDIR/mysql-test MYSQL_TEST_DIR=$BASEDIR/mysql-test
STD_DATA=$MYSQL_TEST_DIR/std_data
TESTDIR="$MYSQL_TEST_DIR/t/" TESTDIR="$MYSQL_TEST_DIR/t/"
TESTSUFFIX=test TESTSUFFIX=test
...@@ -127,6 +128,7 @@ else ...@@ -127,6 +128,7 @@ else
INSTALL_DB="../scripts/install_test_db -bin" INSTALL_DB="../scripts/install_test_db -bin"
fi fi
SLAVE_MYSQLD=$MYSQLD #this will be changed later if we are doing gcov SLAVE_MYSQLD=$MYSQLD #this will be changed later if we are doing gcov
...@@ -395,7 +397,7 @@ mysql_restart () { ...@@ -395,7 +397,7 @@ mysql_restart () {
mysql_loadstd () { mysql_loadstd () {
#sleep 2 cp $STD_DATA/*.frm $STD_DATA/*.MRG $MASTER_MYDDIR/test
return 1 return 1
} }
...@@ -506,11 +508,11 @@ then ...@@ -506,11 +508,11 @@ then
[ $res = 1 ] && echo_ok [ $res = 1 ] && echo_ok
fi fi
#$SETCOLOR_NORMAL && $ECHO -n "Loading Standard Test Database" $SETCOLOR_NORMAL && $ECHO -n "Loading Standard Test Database"
#mysql_loadstd mysql_loadstd
#res=$? res=$?
#[ $res != 1 ] && echo_notok && error "Loading STD" [ x$res != x1 ] && echo_notok && error "Loading STD"
#[ $res = 1 ] && echo_ok [ x$res = x1 ] && echo_ok
$SETCOLOR_NORMAL && $ECHO -n "Starting Tests for MySQL $TESTVER Series" $SETCOLOR_NORMAL && $ECHO -n "Starting Tests for MySQL $TESTVER Series"
$SETCOLOR_SUCCESS && echo_ok $SETCOLOR_SUCCESS && echo_ok
......
This diff was suppressed by a .gitattributes entry.
use test;
@r/mrg000002.result select * from m;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment