Commit db2a86ce authored by unknown's avatar unknown
Browse files

Fix running tests suite with non standard tmp dir. 

Default is "var/tmp" 


mysql-test/r/myisam.result:
  Update result file
mysql-test/t/myisam.test:
  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
  Set tmpdir to var/log to get the printout of DATA DIRECTORY also when running with standard tmpdir
parent 6c21bdb9

mysql-test/r/myisam.result

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

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

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

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

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

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

select * from t1;

a

mysql-test/t/myisam.test

+8 −2
Original line number Diff line number Diff line
@@ -734,14 +734,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/tmp" select 9 a;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/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

show create table t1;



connection session2;

disable_query_log;

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

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/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

show create table t1;



connection default;