85 files changed, 183 insertions, 96 deletions

diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
new file mode 100644
index 00000000000..3d114e9dd27
--- /dev/null
+++ b/mysql-test/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST=README README.gcov mysql-test-run t/*.test t/*.opt r/*.result \
+mybin/mysql-test_install_db mybin/start-mysqld mybin/stop-mysqld \
+mybin/translate-tests
+
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc
new file mode 100644
index 00000000000..137749912a7
--- /dev/null
+++ b/mysql-test/include/master-slave.inc
@@ -0,0 +1,11 @@
+connect (master,localhost,root,,test,0,var/tmp/mysql.sock);
+connect (master1,localhost,root,,test,0,var/tmp/mysql.sock);
+connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
+connect (slave1,localhost,root,,test,0,var/tmp/mysql-slave.sock);
+connection slave;
+!slave stop;
+connection master;
+reset master;
+connection slave;
+reset slave;
+!slave start;
diff --git a/mysql-test/mybin/mysql-test_install_db b/mysql-test/install_test_db
index c5e6c43cc71..be037b06538 100755
--- a/mysql-test/mybin/mysql-test_install_db
+++ b/mysql-test/install_test_db
@@ -5,26 +5,36 @@
 # This scripts creates the privilege tables db, host, user, tables_priv,
 # columns_priv in the mysql database, as well as the func table.
 
+if [ x$1 = x"-bin" ]; then
+ shift 1
+ execdir=../bin
+ bindir=../bin
+ BINARY_DIST=1
+ fix_bin=mysql-test
+else
+ execdir=../sql
+ bindir=../client
+ fix_bin=.
+fi
 
 if [ x$1 = x"-slave" ] 
 then
- shift $#
- ldata=var/slave-data
+ shift 1
+ data=var/slave-data
+ ldata=$fix_bin/var/slave-data
  logdir=var/log
- mdata=$ldata/mysql
- execdir=../sql
- bindir=../client
 else
- ldata=var/lib
+ data=var/lib
+ ldata=$fix_bin/var/lib
  logdir=var/log
- mdata=$ldata/mysql
- execdir=../sql
- bindir=../client
 fi
 
+mdata=$data/mysql
+
+
 if test ! -x $execdir/mysqld
 then
-  echo "I can't find no stinking mysqld!"
+  echo "mysqld is missing - looked in $execdir"
   exit 1
 fi
 
@@ -36,25 +46,18 @@ resolved=127.0.0.1
 
 
 # Create database directories mysql & test
-if test ! -d $ldata; then (mkdir -p $ldata || exit 1) && \
- (chmod 700  $ldata || exit 1) ; fi
-if test ! -d $ldata/mysql;
-then
- mkdir -p $ldata/mysql || exit 1;
- chmod 700 $ldata/mysql || exit 1 ; fi
-if test ! -d $ldata/test;
-then
- mkdir -p $ldata/test || exit 1;
- chmod 700 $ldata/test || exit 1 ;
- fi
-if test -w / -a ! -z "$user"; then
-  chown $user $ldata $ldata/mysql $ldata/test || exit 1;
-fi
+if [ -d $data ] ; then rm -rf $data ; fi
+mkdir -p $data $data/mysql $data/test 
 
 #for error messages
+if [ x$BINARY_DIST = x1 ] ; then
+basedir=..
+else
+basedir=.
 rm -rf share
 mkdir  share
 ln -sf ../../sql/share share/mysql 
+fi
 
 #create the directory for logs
 mkdir -p $logdir
@@ -192,7 +195,7 @@ then
 fi
 
 if $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \
-    --basedir=. --datadir=$ldata  << END_OF_DATA
+    --basedir=$basedir --datadir=$ldata  << END_OF_DATA
 use mysql;
 $c_d
 $i_d
diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run
index 740f10f1cad..d2d99724aa4 100755
--- a/mysql-test/mysql-test-run
+++ b/mysql-test/mysql-test-run
@@ -1,4 +1,6 @@
 #! /bin/sh
+# mysql-test-run - originally written by Matt Wagner <matt@mysql.com>
+# modified by Sasha Pachev <sasha@mysql.com>
 
 #++
 # Access Definitions
@@ -7,17 +9,42 @@ DB=test
 DBUSER=test
 DBPASSWD=
 
+# Are we on source or binary distribution?
+
+if [ $0 = scripts/mysql-test-run ] ;
+then
+ BINARY_DIST=1
+ cd mysql-test
+else
+ if [ -d mysql-test ] ; then
+  cd mysql-test
+ fi
+  
+ if [ -f ./mysql-test-run ] && [ -d ../sql ] ; then
+ SOURCE_DIST=1
+ else
+  echo "If you are using binary distirubution, run me from install root as \
+   scripts/mysql-test-run. On source distribution run me from source root as \
+   mysql-test/mysql-test-run or from mysql-test as ./mysql-test-run"
+  exit 1  
+ fi
+ 
+fi
+  
+
 
 #++
 # Misc. Definitions
 #--
+
+#BASEDIR is always one above mysql-test directory 
 CWD=`pwd`
 cd ..
 BASEDIR=`pwd`
 cd $CWD
-MYBIN="$CWD/mybin"
-TESTVER=3.23
-TESTDIR="$CWD/t/$TESTVER"
+MYSQL_TEST_DIR=$BASEDIR/mysql-test
+  
+TESTDIR="$MYSQL_TEST_DIR/t/"
 TESTSUFFIX=test
 TOT_PASS=0
 TOT_FAIL=0
@@ -25,8 +52,8 @@ TOT_TEST=0
 USERT=0
 SYST=0
 REALT=0
-MY_TMP_DIR=$CWD/var/tmp
-TIMEFILE="$CWD/var/tmp/mysqltest-time"
+MY_TMP_DIR=$MYSQL_TEST_DIR/var/tmp
+TIMEFILE="$MYSQL_TEST_DIR/var/tmp/mysqltest-time"
 DASHBLANK="----	----	-------"
 MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \
  myisammrg heap sql"
@@ -53,18 +80,25 @@ done
 #--
 MYRUN_DIR=var/run
 MASTER_MYPORT=9306
-MASTER_MYDDIR="$CWD/var/lib"
-MASTER_MYSOCK="$CWD/var/tmp/mysql.sock"
-MASTER_MYPID="$CWD/var/run/mysqld.pid"
-MASTER_MYLOG="$CWD/var/log/mysqld.log"
-MASTER_MYERR="$CWD/var/log/mysqld.err"
+MASTER_MYDDIR="$MYSQL_TEST_DIR/var/lib"
+MASTER_MYSOCK="$MYSQL_TEST_DIR/var/tmp/mysql.sock"
+MASTER_MYPID="$MYSQL_TEST_DIR/var/run/mysqld.pid"
+MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld.log"
+MASTER_MYERR="$MYSQL_TEST_DIR/var/log/mysqld.err"
+
 
 SLAVE_MYPORT=9307
-SLAVE_MYDDIR="$CWD/var/slave-data"
-SLAVE_MYSOCK="$CWD/var/tmp/mysql-slave.sock"
-SLAVE_MYPID="$CWD/var/run/mysqld-slave.pid"
-SLAVE_MYLOG="$CWD/var/log/mysqld-slave.log"
-SLAVE_MYERR="$CWD/var/log/mysqld-slave.err"
+SLAVE_MYDDIR="$MYSQL_TEST_DIR/var/slave-data"
+SLAVE_MYSOCK="$MYSQL_TEST_DIR/var/tmp/mysql-slave.sock"
+SLAVE_MYPID="$MYSQL_TEST_DIR/var/run/mysqld-slave.pid"
+SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld-slave.log"
+SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err"
+
+if [ x$SOURCE_DIST = x1 ] ; then
+ MY_BASEDIR=$MYSQL_TEST_DIR
+else
+ MY_BASEDIR=$BASEDIR
+fi  
 
 #++
 # Program Definitions
@@ -81,22 +115,50 @@ RM=/bin/rm
 TIME=/usr/bin/time
 TR=/usr/bin/tr
 XARGS=`which xargs`
-MYSQLD="$BASEDIR/sql/mysqld"
-MYSQL_TEST="$BASEDIR/client/mysqltest"
-MYSQLADMIN="$BASEDIR/client/mysqladmin"
+
+# on source dist, we pick up freshly build executables
+# on binary, use what is installed
+if [ x$SOURCE_DIST = x1 ] ; then
+ MYSQLD="$BASEDIR/sql/mysqld"
+ MYSQL_TEST="$BASEDIR/client/mysqltest"
+ MYSQLADMIN="$BASEDIR/client/mysqladmin"
+ INSTALL_DB="./install_test_db"
+else
+ MYSQLD="$BASEDIR/bin/mysqld"
+ MYSQL_TEST="$BASEDIR/bin/mysqltest"
+ MYSQLADMIN="$BASEDIR/bin/mysqladmin"
+ INSTALL_DB="../scripts/install_test_db -bin"
+fi
+
+
+
 MYSQL_TEST="$MYSQL_TEST --socket=$MASTER_MYSOCK --database=$DB --user=$DBUSER --password=$DBPASSWD --silent"
-INSTALL_DB="$MYBIN/mysql-test_install_db"
 GDB_MASTER_INIT=/tmp/gdbinit.master
 GDB_SLAVE_INIT=/tmp/gdbinit.slave
 
+if [ "$1" = "-force" ] ; then
+ FORCE=1
+ shift 1
+fi
+
 if [ "$1" = "-gcov" ];
 then
+  if [ x$BINARY_DIST = x1 ] ; then
+   echo "Cannot do coverage test without the source - please us source dist"
+   exit 1
+  fi
   DO_GCOV=1
   shift 1
 fi  
 
 if [ "$1" = "-gdb" ];
 then
+# if the user really wanted to run binary dist in a debugger, he can
+# but we should warn him
+  if [ x$BINARY_DIST = x1 ] ; then
+   echo "Note: you will get more meaningful output on a source distribution \
+   compiled with debugging option when running tests with -gdb option"
+  fi
   DO_GDB=1
   shift 1
 fi  
@@ -147,7 +209,7 @@ echo_pass () {
 prompt_user ()
 {
  echo $1
- read
+ read unused
 }
 
 echo_fail () {
@@ -224,7 +286,7 @@ gcov_prepare () {
 	for f in *.h *.cc *.c; do
 	  cp $f $GCOV_SLAVE_SRC/$d
 	done
-	cd $CWD
+	cd $MYSQL_TEST_DIR
    done    
 }
 
@@ -239,12 +301,12 @@ gcov_collect () {
 	for f in *.h *.cc *.c; do
 	    $GCOV $f 2>>$GCOV_MASTER_ERR  >>$GCOV_MASTER_MSG
 	done
-	cd $CWD
+	cd $MYSQL_TEST_DIR
 	cd $GCOV_SLAVE_SRC/$d
 	for f in *.h *.cc *.c; do
 	    $GCOV $f 2>>$GCOV_SLAVE_ERR  >>$GCOV_SLAVE_MSG
 	done
-	cd $CWD
+	cd $MYSQL_TEST_DIR
     done
 
     $ECHO "gcov master info in $GCOV_MASTER_MSG, errors in $GCOV_MASTER_ERR"
@@ -257,7 +319,7 @@ start_master()
     #start master
     master_args="--no-defaults --log-bin \
     	    --server-id=1 \
-            --basedir=$CWD \
+            --basedir=$MY_BASEDIR \
 	    --port=$MASTER_MYPORT \
 	    --core-file \
             --datadir=$MASTER_MYDDIR \
@@ -286,7 +348,7 @@ start_slave()
 	    --master-host=127.0.0.1 \
 	    --master-port=$MASTER_MYPORT \
 	    --core-file \
-            --basedir=$CWD \
+            --basedir=$MY_BASEDIR \
             --datadir=$SLAVE_MYDDIR \
 	    --pid-file=$SLAVE_MYPID \
 	    --port=$SLAVE_MYPORT \
@@ -307,7 +369,7 @@ start_slave()
 mysql_start () {
     start_master
     start_slave
-    cd $CWD
+    cd $MYSQL_TEST_DIR
     return 1
 }
 
@@ -394,7 +456,7 @@ run_testcase ()
   fi  
  fi
 
- cd $CWD
+ cd $MYSQL_TEST_DIR
   
  if [ -f $tf ] ; then
     mytime=`$TIME -p $MYSQL_TEST < $tf 2> $TIMEFILE`
@@ -425,6 +487,13 @@ run_testcase ()
 	$CAT $TIMEFILE
 	$ECHO
 	$ECHO
+	if [ x$FORCE != x1 ] ; then
+	 $SETCOLOR_NORMAL
+	 echo "Aborting, if you want to continue, re-run with -force"
+	 mysql_stop
+	 exit 1
+	fi
+	 
 	$SETCOLOR_NORMAL && $ECHO -n "Restarting mysqld	$DASHBLANK"
 	mysql_restart
 	$SETCOLOR_SUCCESS && echo_ok
diff --git a/mysql-test/r/3.23/alt000001.result b/mysql-test/r/alt000001.result
index cc95b808d23..cc95b808d23 100644
--- a/mysql-test/r/3.23/alt000001.result
+++ b/mysql-test/r/alt000001.result
diff --git a/mysql-test/r/3.23/ins000001.result b/mysql-test/r/ins000001.result
index 1003b3b6b18..1003b3b6b18 100644
--- a/mysql-test/r/3.23/ins000001.result
+++ b/mysql-test/r/ins000001.result
diff --git a/mysql-test/r/3.23/rpl000001.a.result b/mysql-test/r/rpl000001.a.result
index 982e0523cfb..982e0523cfb 100644
--- a/mysql-test/r/3.23/rpl000001.a.result
+++ b/mysql-test/r/rpl000001.a.result
diff --git a/mysql-test/r/3.23/rpl000001.b.result b/mysql-test/r/rpl000001.b.result
index 17cdaf46fa6..17cdaf46fa6 100644
--- a/mysql-test/r/3.23/rpl000001.b.result
+++ b/mysql-test/r/rpl000001.b.result
diff --git a/mysql-test/r/3.23/rpl000002.result b/mysql-test/r/rpl000002.result
index c76fc46ae97..c76fc46ae97 100644
--- a/mysql-test/r/3.23/rpl000002.result
+++ b/mysql-test/r/rpl000002.result
diff --git a/mysql-test/r/3.23/rpl000003.result b/mysql-test/r/rpl000003.result
index c62967af0bb..c62967af0bb 100644
--- a/mysql-test/r/3.23/rpl000003.result
+++ b/mysql-test/r/rpl000003.result
diff --git a/mysql-test/r/3.23/rpl000004.a.result b/mysql-test/r/rpl000004.a.result
index 4061fdb4a0d..4061fdb4a0d 100644
--- a/mysql-test/r/3.23/rpl000004.a.result
+++ b/mysql-test/r/rpl000004.a.result
diff --git a/mysql-test/r/3.23/rpl000004.b.result b/mysql-test/r/rpl000004.b.result
index c71e0b46471..c71e0b46471 100644
--- a/mysql-test/r/3.23/rpl000004.b.result
+++ b/mysql-test/r/rpl000004.b.result
diff --git a/mysql-test/r/3.23/rpl000005.result b/mysql-test/r/rpl000005.result
index 763154b938e..763154b938e 100644
--- a/mysql-test/r/3.23/rpl000005.result
+++ b/mysql-test/r/rpl000005.result
diff --git a/mysql-test/r/3.23/rpl000006.result b/mysql-test/r/rpl000006.result
index c3e4a2326d0..c3e4a2326d0 100644
--- a/mysql-test/r/3.23/rpl000006.result
+++ b/mysql-test/r/rpl000006.result
diff --git a/mysql-test/r/3.23/rpl000007.result b/mysql-test/r/rpl000007.result
index 08f13272f2a..08f13272f2a 100644
--- a/mysql-test/r/3.23/rpl000007.result
+++ b/mysql-test/r/rpl000007.result
diff --git a/mysql-test/r/3.23/rpl000008.result b/mysql-test/r/rpl000008.result
index 964ea8d84de..964ea8d84de 100644
--- a/mysql-test/r/3.23/rpl000008.result
+++ b/mysql-test/r/rpl000008.result
diff --git a/mysql-test/r/3.23/rpl000009.result b/mysql-test/r/rpl000009.result
index 08f13272f2a..08f13272f2a 100644
--- a/mysql-test/r/3.23/rpl000009.result
+++ b/mysql-test/r/rpl000009.result
diff --git a/mysql-test/r/3.23/rpl000010.result b/mysql-test/r/rpl000010.result
index 982e0523cfb..982e0523cfb 100644
--- a/mysql-test/r/3.23/rpl000010.result
+++ b/mysql-test/r/rpl000010.result
diff --git a/mysql-test/r/3.23/rpl000011.result b/mysql-test/r/rpl000011.result
index 982e0523cfb..982e0523cfb 100644
--- a/mysql-test/r/3.23/rpl000011.result
+++ b/mysql-test/r/rpl000011.result
diff --git a/mysql-test/r/3.23/rpl000012.result b/mysql-test/r/rpl000012.result
index 22fd6be3003..22fd6be3003 100644
--- a/mysql-test/r/3.23/rpl000012.result
+++ b/mysql-test/r/rpl000012.result
diff --git a/mysql-test/r/3.23/rpl000012.status.result b/mysql-test/r/rpl000012.status.result
index fbbae06c3f9..fbbae06c3f9 100644
--- a/mysql-test/r/3.23/rpl000012.status.result
+++ b/mysql-test/r/rpl000012.status.result
diff --git a/mysql-test/r/3.23/rpl000013.result b/mysql-test/r/rpl000013.result
index 22fd6be3003..22fd6be3003 100644
--- a/mysql-test/r/3.23/rpl000013.result
+++ b/mysql-test/r/rpl000013.result
diff --git a/mysql-test/r/3.23/rpl000013.status.result b/mysql-test/r/rpl000013.status.result
index fbbae06c3f9..fbbae06c3f9 100644
--- a/mysql-test/r/3.23/rpl000013.status.result
+++ b/mysql-test/r/rpl000013.status.result
diff --git a/mysql-test/r/3.23/sel000001.result b/mysql-test/r/sel000001.result
index 749778fabac..749778fabac 100644
--- a/mysql-test/r/3.23/sel000001.result
+++ b/mysql-test/r/sel000001.result
diff --git a/mysql-test/r/3.23/sel000002.result b/mysql-test/r/sel000002.result
index c62967af0bb..c62967af0bb 100644
--- a/mysql-test/r/3.23/sel000002.result
+++ b/mysql-test/r/sel000002.result
diff --git a/mysql-test/r/3.23/sel000003.result b/mysql-test/r/sel000003.result
index 098e2cce1b0..098e2cce1b0 100644
--- a/mysql-test/r/3.23/sel000003.result
+++ b/mysql-test/r/sel000003.result
diff --git a/mysql-test/r/3.23/sel000004.result b/mysql-test/r/sel000004.result
index 26f5563f3df..26f5563f3df 100644
--- a/mysql-test/r/3.23/sel000004.result
+++ b/mysql-test/r/sel000004.result
diff --git a/mysql-test/r/3.23/sel000005.result b/mysql-test/r/sel000005.result
index 26f5563f3df..26f5563f3df 100644
--- a/mysql-test/r/3.23/sel000005.result
+++ b/mysql-test/r/sel000005.result
diff --git a/mysql-test/r/3.23/sel000006.result b/mysql-test/r/sel000006.result
index 82967786fce..82967786fce 100644
--- a/mysql-test/r/3.23/sel000006.result
+++ b/mysql-test/r/sel000006.result
diff --git a/mysql-test/r/3.23/sel000007.result b/mysql-test/r/sel000007.result
index 2a175b2d723..2a175b2d723 100644
--- a/mysql-test/r/3.23/sel000007.result
+++ b/mysql-test/r/sel000007.result
diff --git a/mysql-test/r/3.23/sel000008.result b/mysql-test/r/sel000008.result
index 3438a3e6970..3438a3e6970 100644
--- a/mysql-test/r/3.23/sel000008.result
+++ b/mysql-test/r/sel000008.result
diff --git a/mysql-test/r/3.23/sel000009.result b/mysql-test/r/sel000009.result
index 410b404774f..410b404774f 100644
--- a/mysql-test/r/3.23/sel000009.result
+++ b/mysql-test/r/sel000009.result
diff --git a/mysql-test/r/3.23/sel000010.result b/mysql-test/r/sel000010.result
index 439e30093aa..439e30093aa 100644
--- a/mysql-test/r/3.23/sel000010.result
+++ b/mysql-test/r/sel000010.result
diff --git a/mysql-test/r/3.23/sel000011.result b/mysql-test/r/sel000011.result
index a0e5f33bc6b..a0e5f33bc6b 100644
--- a/mysql-test/r/3.23/sel000011.result
+++ b/mysql-test/r/sel000011.result
diff --git a/mysql-test/r/3.23/sel000012.result b/mysql-test/r/sel000012.result
index 579fe8d87a3..579fe8d87a3 100644
--- a/mysql-test/r/3.23/sel000012.result
+++ b/mysql-test/r/sel000012.result
diff --git a/mysql-test/r/3.23/sel000013.result b/mysql-test/r/sel000013.result
index eda7608ef4d..eda7608ef4d 100644
--- a/mysql-test/r/3.23/sel000013.result
+++ b/mysql-test/r/sel000013.result
diff --git a/mysql-test/r/3.23/sel000014.result b/mysql-test/r/sel000014.result
index c9c359068ca..c9c359068ca 100644
--- a/mysql-test/r/3.23/sel000014.result
+++ b/mysql-test/r/sel000014.result
diff --git a/mysql-test/r/3.23/sel000015.result b/mysql-test/r/sel000015.result
index e4fca79f398..e4fca79f398 100644
--- a/mysql-test/r/3.23/sel000015.result
+++ b/mysql-test/r/sel000015.result
diff --git a/mysql-test/r/3.23/sel000016.result b/mysql-test/r/sel000016.result
index 58384e104cc..58384e104cc 100644
--- a/mysql-test/r/3.23/sel000016.result
+++ b/mysql-test/r/sel000016.result
diff --git a/mysql-test/r/3.23/sel000017.result b/mysql-test/r/sel000017.result
index d68bb440274..d68bb440274 100644
--- a/mysql-test/r/3.23/sel000017.result
+++ b/mysql-test/r/sel000017.result
diff --git a/mysql-test/r/3.23/sel000018.result b/mysql-test/r/sel000018.result
index 1155ffd553e..1155ffd553e 100644
--- a/mysql-test/r/3.23/sel000018.result
+++ b/mysql-test/r/sel000018.result
diff --git a/mysql-test/r/3.23/sel000019.result b/mysql-test/r/sel000019.result
index 56e8bfebdcd..56e8bfebdcd 100644
--- a/mysql-test/r/3.23/sel000019.result
+++ b/mysql-test/r/sel000019.result
diff --git a/mysql-test/r/3.23/sel000020.result b/mysql-test/r/sel000020.result
index 3d3b68fca73..3d3b68fca73 100644
--- a/mysql-test/r/3.23/sel000020.result
+++ b/mysql-test/r/sel000020.result
diff --git a/mysql-test/r/3.23/sel000021.result b/mysql-test/r/sel000021.result
index 03ab284ac5d..03ab284ac5d 100644
--- a/mysql-test/r/3.23/sel000021.result
+++ b/mysql-test/r/sel000021.result
diff --git a/mysql-test/r/3.23/sel000022.result b/mysql-test/r/sel000022.result
index 4f6dedaa83f..4f6dedaa83f 100644
--- a/mysql-test/r/3.23/sel000022.result
+++ b/mysql-test/r/sel000022.result
diff --git a/mysql-test/r/3.23/sel000023.result b/mysql-test/r/sel000023.result
index 835c340b686..835c340b686 100644
--- a/mysql-test/r/3.23/sel000023.result
+++ b/mysql-test/r/sel000023.result
diff --git a/mysql-test/r/3.23/sel000024.result b/mysql-test/r/sel000024.result
index daa9a143b60..daa9a143b60 100644
--- a/mysql-test/r/3.23/sel000024.result
+++ b/mysql-test/r/sel000024.result
diff --git a/mysql-test/r/3.23/sel000025.result b/mysql-test/r/sel000025.result
index caf244be1d9..caf244be1d9 100644
--- a/mysql-test/r/3.23/sel000025.result
+++ b/mysql-test/r/sel000025.result
diff --git a/mysql-test/r/3.23/sel000026.result b/mysql-test/r/sel000026.result
index acf301a349f..acf301a349f 100644
--- a/mysql-test/r/3.23/sel000026.result
+++ b/mysql-test/r/sel000026.result
diff --git a/mysql-test/r/3.23/sel000027.result b/mysql-test/r/sel000027.result
index df2945c6da8..df2945c6da8 100644
--- a/mysql-test/r/3.23/sel000027.result
+++ b/mysql-test/r/sel000027.result
diff --git a/mysql-test/r/3.23/sel000028.result b/mysql-test/r/sel000028.result
index cd5b3268b53..cd5b3268b53 100644
--- a/mysql-test/r/3.23/sel000028.result
+++ b/mysql-test/r/sel000028.result
diff --git a/mysql-test/r/3.23/sel000029.result b/mysql-test/r/sel000029.result
index 0ceb7494fd3..0ceb7494fd3 100644
--- a/mysql-test/r/3.23/sel000029.result
+++ b/mysql-test/r/sel000029.result
diff --git a/mysql-test/r/3.23/sel000030.result b/mysql-test/r/sel000030.result
index 575549b600f..575549b600f 100644
--- a/mysql-test/r/3.23/sel000030.result
+++ b/mysql-test/r/sel000030.result
diff --git a/mysql-test/r/3.23/sel000100.result b/mysql-test/r/sel000100.result
index 6c204279c28..6c204279c28 100644
--- a/mysql-test/r/3.23/sel000100.result
+++ b/mysql-test/r/sel000100.result
diff --git a/mysql-test/r/3.23/shw000001.result b/mysql-test/r/shw000001.result
index f38d2f1ef36..f38d2f1ef36 100644
--- a/mysql-test/r/3.23/shw000001.result
+++ b/mysql-test/r/shw000001.result
diff --git a/mysql-test/std_data/words b/mysql-test/std_data/words.dat
index c2d1cb70cbf..c2d1cb70cbf 100644
--- a/mysql-test/std_data/words
+++ b/mysql-test/std_data/words.dat
diff --git a/mysql-test/t/3.23/README b/mysql-test/t/README
index e69de29bb2d..e69de29bb2d 100644
--- a/mysql-test/t/3.23/README
+++ b/mysql-test/t/README
diff --git a/mysql-test/t/3.23/alt000001.test b/mysql-test/t/alt000001.test
index c6c767b8d5d..88defc5b035 100644
--- a/mysql-test/t/3.23/alt000001.test
+++ b/mysql-test/t/alt000001.test
@@ -3,4 +3,4 @@ drop table if exists x;
 create table x (n int);
 insert into x values(9),(3),(12),(10);
 alter table x order by n;
-@r/3.23/alt000001.result select * from x;
+@r/alt000001.result select * from x;
diff --git a/mysql-test/t/3.23/err000001.test b/mysql-test/t/err000001.test
index f264c0bb172..f264c0bb172 100644
--- a/mysql-test/t/3.23/err000001.test
+++ b/mysql-test/t/err000001.test
diff --git a/mysql-test/t/3.23/ins000001.test b/mysql-test/t/ins000001.test
index 7fafd7d48f1..1c40d1ffa8d 100644
--- a/mysql-test/t/3.23/ins000001.test
+++ b/mysql-test/t/ins000001.test
@@ -8,4 +8,4 @@ insert into emails values ('sasha@mysql.com'),('monty@mysql.com'),
 create table domain(id int not null auto_increment primary key,
  domain varchar(50), unique(domain));
 insert into domain (domain) select distinct substring(email, locate('@', email)+1) from emails;
-@r/3.23/ins000001.result select * from domain;
+@r/ins000001.result select * from domain;
diff --git a/mysql-test/t/3.23/rpl000001.test b/mysql-test/t/rpl000001.test
index bd094cd6391..5bf0e0dbab5 100644
--- a/mysql-test/t/3.23/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -1,15 +1,15 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 use test;
 drop table if exists words;
 create table words (word char(20) not null);
-load data infile '../../std_data/words' into table words;
+load data infile '../../std_data/words.dat' into table words;
 drop table if exists foo;
 create table foo(n int);
 insert into foo values(1),(2);
 connection slave;
 sleep 2;
 use test;
-@r/3.23/rpl000001.a.result select * from foo;
-@r/3.23/rpl000001.b.result select sum(length(word)) from words;
+@r/rpl000001.a.result select * from foo;
+@r/rpl000001.b.result select sum(length(word)) from words;
 
diff --git a/mysql-test/t/3.23/rpl000002.test b/mysql-test/t/rpl000002.test
index b411a0f42ce..29741b5b6cb 100644
--- a/mysql-test/t/3.23/rpl000002.test
+++ b/mysql-test/t/rpl000002.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 use test;
 drop table if exists x;
@@ -8,4 +8,4 @@ insert into x values (NULL),(NULL),(NULL);
 connection slave;
 use test;
 sleep 0.5;
-@r/3.23/rpl000002.result select * from x;
+@r/rpl000002.result select * from x;
diff --git a/mysql-test/t/3.23/rpl000003.test b/mysql-test/t/rpl000003.test
index 8aa6eb09c4d..d7e21a3590a 100644
--- a/mysql-test/t/3.23/rpl000003.test
+++ b/mysql-test/t/rpl000003.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop table if exists x;
 create table x(n int primary key);
@@ -6,4 +6,4 @@ create table x(n int primary key);
 insert into x values (3);
 connection slave;
 sleep 0.5;
-@r/3.23/rpl000003.result select * from x;                                     
+@r/rpl000003.result select * from x;                                     
diff --git a/mysql-test/t/3.23/rpl000004.test b/mysql-test/t/rpl000004.test
index 795bb0e32a2..b7ab81a0553 100644
--- a/mysql-test/t/3.23/rpl000004.test
+++ b/mysql-test/t/rpl000004.test
@@ -1,18 +1,18 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 use test;
 set SQL_LOG_BIN=0;
 drop table if exists words;
 create table words (word char(20) not null, index(word));
-load data infile '../../std_data/words' into table words;
+load data infile '../../std_data/words.dat' into table words;
 drop table if exists words1;
 create table words1 (word char(20) not null);
-load data infile '../../std_data/words' into table words1;
+load data infile '../../std_data/words.dat' into table words1;
 connection slave;
 use test;
 drop table if exists words;
 load table words from master;
 drop table if exists words1;
 load table words1 from master;
-@r/3.23/rpl000004.a.result check table words;
-@r/3.23/rpl000004.b.result select count(*) from words1;
+@r/rpl000004.a.result check table words;
+@r/rpl000004.b.result select count(*) from words1;
diff --git a/mysql-test/t/3.23/rpl000005.test b/mysql-test/t/rpl000005.test
index dac48849e25..944f701d765 100644
--- a/mysql-test/t/3.23/rpl000005.test
+++ b/mysql-test/t/rpl000005.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop table if exists test;
 CREATE TABLE test (name varchar(64), age smallint(3));
@@ -6,7 +6,7 @@ INSERT INTO  test SET name='Andy', age=31;
 INSERT test SET name='Jacob', age=2;
 INSERT into test SET name='Caleb', age=1;
 ALTER TABLE test ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
-@r/3.23/rpl000005.result select * from test;
+@r/rpl000005.result select * from test;
 connection slave;
 sleep 0.5;
-@r/3.23/rpl000005.result select * from test;
+@r/rpl000005.result select * from test;
diff --git a/mysql-test/t/3.23/rpl000006.test b/mysql-test/t/rpl000006.test
index 8f85b3a7952..56971cd049c 100644
--- a/mysql-test/t/3.23/rpl000006.test
+++ b/mysql-test/t/rpl000006.test
@@ -1,12 +1,12 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 set SQL_LOG_BIN=0;
 set timestamp=200006;
 drop table if exists foo;
 create table foo(t timestamp not null,a char(1));
 insert into foo ( a) values ('F');
-@r/3.23/rpl000006.result select unix_timestamp(t) from foo;
+@r/rpl000006.result select unix_timestamp(t) from foo;
 connection slave;
 drop table if exists foo;
 load table foo from master;
-@r/3.23/rpl000006.result select unix_timestamp(t) from foo;
+@r/rpl000006.result select unix_timestamp(t) from foo;
diff --git a/mysql-test/t/3.23/rpl000007-slave.opt b/mysql-test/t/rpl000007-slave.opt
index 9ff99337d1f..9ff99337d1f 100644
--- a/mysql-test/t/3.23/rpl000007-slave.opt
+++ b/mysql-test/t/rpl000007-slave.opt
diff --git a/mysql-test/t/3.23/rpl000007.test b/mysql-test/t/rpl000007.test
index 5b9ef12bddd..2a3748868d3 100644
--- a/mysql-test/t/3.23/rpl000007.test
+++ b/mysql-test/t/rpl000007.test
@@ -1,6 +1,6 @@
 #this one assumes we are ignoring updates on table foo, but doing
 #the ones on bar
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection slave;
 use test;
 drop table if exists foo;
@@ -16,4 +16,4 @@ create table bar (m int);
 insert into bar values(15);
 connection slave;
 sleep 1;
-@r/3.23/rpl000007.result select foo.n,bar.m from foo,bar;
+@r/rpl000007.result select foo.n,bar.m from foo,bar;
diff --git a/mysql-test/t/3.23/rpl000008-slave.opt b/mysql-test/t/rpl000008-slave.opt
index 79b3bf6174b..79b3bf6174b 100644
--- a/mysql-test/t/3.23/rpl000008-slave.opt
+++ b/mysql-test/t/rpl000008-slave.opt
diff --git a/mysql-test/t/3.23/rpl000008.test b/mysql-test/t/rpl000008.test
index 58819c2835f..a50016ed9c0 100644
--- a/mysql-test/t/3.23/rpl000008.test
+++ b/mysql-test/t/rpl000008.test
@@ -1,6 +1,6 @@
 #this one assumes we are ignoring updates on table foo, but doing
 #the ones on all other tables
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection slave;
 use test;
 drop table if exists foo;
@@ -19,4 +19,4 @@ create table choo (k int);
 insert into choo values(55);
 connection slave;
 sleep 1;
-@r/3.23/rpl000008.result select foo.n,bar.m,choo.k from foo,bar,choo;
+@r/rpl000008.result select foo.n,bar.m,choo.k from foo,bar,choo;
diff --git a/mysql-test/t/3.23/rpl000009-slave.opt b/mysql-test/t/rpl000009-slave.opt
index 245e310c5d8..245e310c5d8 100644
--- a/mysql-test/t/3.23/rpl000009-slave.opt
+++ b/mysql-test/t/rpl000009-slave.opt
diff --git a/mysql-test/t/3.23/rpl000009.test b/mysql-test/t/rpl000009.test
index ae491e1ab98..0a872bb3663 100644
--- a/mysql-test/t/3.23/rpl000009.test
+++ b/mysql-test/t/rpl000009.test
@@ -1,6 +1,6 @@
 #this one assumes we are ignoring updates on tables in database foo, but doing
 #the ones in database bar
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop database if exists foo;
 create database foo;
@@ -20,4 +20,4 @@ create table bar.bar (m int);
 insert into bar.bar values(15);
 connection slave;
 sleep 1;
-@r/3.23/rpl000009.result select foo.foo.n,bar.bar.m from foo.foo,bar.bar;
+@r/rpl000009.result select foo.foo.n,bar.bar.m from foo.foo,bar.bar;
diff --git a/mysql-test/t/3.23/rpl000010-slave.opt b/mysql-test/t/rpl000010-slave.opt
index 429a7f63f7b..429a7f63f7b 100644
--- a/mysql-test/t/3.23/rpl000010-slave.opt
+++ b/mysql-test/t/rpl000010-slave.opt
diff --git a/mysql-test/t/3.23/rpl000010.test b/mysql-test/t/rpl000010.test
index 3bb55dc854a..6b5ec69fb5f 100644
--- a/mysql-test/t/3.23/rpl000010.test
+++ b/mysql-test/t/rpl000010.test
@@ -1,6 +1,6 @@
 #this tests the offset off by 22 mystery bug
 #must run slave with --disconnect-slave-event-count=1 --master-connect-retry=1
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection slave;
 drop table if exists foo;
 connection master;
@@ -10,4 +10,4 @@ insert into foo values(NULL);
 insert into foo values(2);
 connection slave;
 sleep 5;
-@r/3.23/rpl000010.result select n from foo;
+@r/rpl000010.result select n from foo;
diff --git a/mysql-test/t/3.23/rpl000011.test b/mysql-test/t/rpl000011.test
index a5759f52e09..f0776136541 100644
--- a/mysql-test/t/3.23/rpl000011.test
+++ b/mysql-test/t/rpl000011.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 use test;
 drop table if exists foo;
@@ -14,5 +14,5 @@ insert into foo values(2);
 connection slave;
 #let slave catch up
 sleep 1;
-@r/3.23/rpl000011.result select * from foo;
+@r/rpl000011.result select * from foo;
 
diff --git a/mysql-test/t/3.23/rpl000012.test b/mysql-test/t/rpl000012.test
index 205c78d604c..55d6bd4d4f2 100644
--- a/mysql-test/t/3.23/rpl000012.test
+++ b/mysql-test/t/rpl000012.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop table if exists x;
 create table x(n int);
@@ -15,5 +15,5 @@ insert into x values(6);
 disconnect master1;
 connection slave;
 sleep 1;
-@r/3.23/rpl000012.result select * from x;
-@r/3.23/rpl000012.status.result show status like 'Slave_open_temp_tables';
+@r/rpl000012.result select * from x;
+@r/rpl000012.status.result show status like 'Slave_open_temp_tables';
diff --git a/mysql-test/t/3.23/rpl000013-slave.opt b/mysql-test/t/rpl000013-slave.opt
index 2662c695b41..2662c695b41 100644
--- a/mysql-test/t/3.23/rpl000013-slave.opt
+++ b/mysql-test/t/rpl000013-slave.opt
diff --git a/mysql-test/t/3.23/rpl000013.test b/mysql-test/t/rpl000013.test
index f54482f41e9..ec015bbe357 100644
--- a/mysql-test/t/3.23/rpl000013.test
+++ b/mysql-test/t/rpl000013.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop table if exists x;
 create table x(n int);
@@ -21,5 +21,5 @@ while ($1)
  sleep 0.2;
  dec $1;
 }
-@r/3.23/rpl000013.result select * from x;
-@r/3.23/rpl000013.status.result show status like 'Slave_open_temp_tables';
+@r/rpl000013.result select * from x;
+@r/rpl000013.status.result show status like 'Slave_open_temp_tables';
diff --git a/mysql-test/t/3.23/sel000001.test b/mysql-test/t/sel000001.test
index 233e986ad3c..7f5fb303984 100644
--- a/mysql-test/t/3.23/sel000001.test
+++ b/mysql-test/t/sel000001.test
@@ -14,4 +14,4 @@
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (s CHAR(20) PRIMARY KEY, id INT);
 INSERT INTO t VALUES ('cat', 1), ('mouse', 3), ('dog', 2), ('snake', 77);
-@r/3.23/sel000001.result SELECT s, id FROM t WHERE s = 'mouse';
+@r/sel000001.result SELECT s, id FROM t WHERE s = 'mouse';
diff --git a/mysql-test/t/3.23/sel000002.test b/mysql-test/t/sel000002.test
index 3a0178a05d4..27c88b503dc 100644
--- a/mysql-test/t/3.23/sel000002.test
+++ b/mysql-test/t/sel000002.test
@@ -13,4 +13,4 @@
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (n INT);
 INSERT INTO t VALUES (1), (2), (3);
-@r/3.23/sel000002.result SELECT * FROM t;
+@r/sel000002.result SELECT * FROM t;
diff --git a/mysql-test/t/3.23/sel000003.test b/mysql-test/t/sel000003.test
index 883be4fb079..cef82ab2596 100644
--- a/mysql-test/t/3.23/sel000003.test
+++ b/mysql-test/t/sel000003.test
@@ -14,4 +14,4 @@
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (name CHAR(20) NOT NULL PRIMARY KEY, score SMALLINT NOT NULL, KEY(score));
 INSERT INTO t VALUES ('Sasha', 20), ('Matt', 20), ('Monty', 10), ('David', 10), ('Tim', 10), ('Jeremy', 10);
-@r/3.23/sel000003.result SELECT COUNT(*) as n, score FROM t GROUP BY score;
+@r/sel000003.result SELECT COUNT(*) as n, score FROM t GROUP BY score;
diff --git a/mysql-test/t/3.23/sel000004.test b/mysql-test/t/sel000004.test
index 6146ff641e0..d7b59a9f99e 100644
--- a/mysql-test/t/3.23/sel000004.test
+++ b/mysql-test/t/sel000004.test
@@ -16,6 +16,6 @@ val int(10) not null);
 insert into elt_ck1 values (1),(2),(4);
 insert into elt_ck2 values (1,1),(2,1),(3,1),(4,2);
 
-@r/3.23/sel000004.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two 
+@r/sel000004.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two 
 where two.id=one.id order by one.id;
 
diff --git a/mysql-test/t/3.23/sel000005.test b/mysql-test/t/sel000005.test
index 18541d5d69e..d6dbb381654 100644
--- a/mysql-test/t/3.23/sel000005.test
+++ b/mysql-test/t/sel000005.test
@@ -16,6 +16,6 @@ val int(10) not null);
 insert into elt_ck1 values (1),(2),(4);
 insert into elt_ck2 values (1,1),(2,1),(3,1),(4,2);
 
-@r/3.23/sel000005.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two 
+@r/sel000005.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two 
 where two.id=one.id ;
 
diff --git a/mysql-test/t/3.23/sel000100.test b/mysql-test/t/sel000100.test
index cd3f7005445..718e67de9ea 100644
--- a/mysql-test/t/3.23/sel000100.test
+++ b/mysql-test/t/sel000100.test
@@ -21,7 +21,7 @@ CREATE TABLE test2 (
   KEY NAME (NAME)
 );
 
-@r/3.23/sel000100.result SELECT DISTINCT
+@r/sel000100.result SELECT DISTINCT
     test2.id AS key_link_id,
     test2.name AS link
 FROM test1
diff --git a/mysql-test/t/3.23/shw000001.test b/mysql-test/t/shw000001.test
index 0abb940d207..c92d710a49c 100644
--- a/mysql-test/t/3.23/shw000001.test
+++ b/mysql-test/t/shw000001.test
@@ -4,4 +4,4 @@ create table test (
   test_set set( 'val1', 'val2', 'val3' ) not null default '',
   name char(20) default 'O''Brien'
   ) comment = 'it\'s a table' ;
-@r/3.23/shw000001.result show create table test ;
+@r/shw000001.result show create table test ;