Commit 1aad903b authored by unknown's avatar unknown
Browse files

Use MYSQLTEST_VARDIR variable

parent 607af5c6

mysql-test/r/symlink.result

+2 −2
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ show create table t1; 
Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/log/'

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/log/'

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a

mysql-test/t/symlink.test

+4 −4
Original line number Diff line number Diff line
@@ -147,20 +147,20 @@ connect (session2,localhost,root,,); 


connection session1;

disable_query_log;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 9 a;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/log" select 9 a;

enable_query_log;

# If running test suite with a non standard tmp dir, the "show create table"

# will print "DATA_DIRECTORY=". Use replace_result to mask it out

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

show create table t1;



connection session2;

disable_query_log;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 99 a;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/log" select 99 a;

enable_query_log;

# If running test suite with a non standard tmp dir, the "show create table"

# will print "DATA_DIRECTORY=". Use replace_result to mask it out

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

show create table t1;



connection default;