Merge mattiasj@bk-internal.mysql.com:/home/bk/mysql-5.0-engines

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main

mysql-test/r/symlink.result

@@ -100,10 +100,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 CREATE TABLE t1(a INT)
-DATA DIRECTORY='TEST_DIR/var/master-data/mysql'
-INDEX DIRECTORY='TEST_DIR/var/master-data/mysql';
+DATA DIRECTORY='TEST_DIR/master-data/mysql'
+INDEX DIRECTORY='TEST_DIR/master-data/mysql';
 RENAME TABLE t1 TO user;
-ERROR HY000: Can't create/write to file 'TEST_DIR/var/master-data/mysql/user.MYI' (Errcode: 17)
+ERROR HY000: Can't create/write to file 'TEST_DIR/master-data/mysql/user.MYI' (Errcode: 17)
 DROP TABLE t1;
 show create table t1;
 Table	Create Table

mysql-test/t/symlink.test

@@ -127,11 +127,11 @@ drop table t1;
 #
 # BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE
 #
---replace_result $MYSQL_TEST_DIR TEST_DIR
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
 eval CREATE TABLE t1(a INT)
-DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/mysql'
-INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data/mysql';
---replace_result $MYSQL_TEST_DIR TEST_DIR
+DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql'
+INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql';
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
 --error 1
 RENAME TABLE t1 TO user;
 DROP TABLE t1;