Commit 29f72a0b authored by thek@kpdesk.mysql.com's avatar thek@kpdesk.mysql.com
Browse files

Bug#17498 failed to put data file in custom directory use "data directory" option 

- When this bug was corrected it changed the behavior 
  for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
  test file.
parent 3542d83a

mysql-test/r/myisam.result

+0 −21
Original line number Diff line number Diff line
@@ -797,24 +797,3 @@ a b 
xxxxxxxxx	bbbbbb

xxxxxxxxx	bbbbbb

DROP TABLE t1;
 
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/'

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/'

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

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;

mysql-test/r/symlink.result

+21 −0
Original line number Diff line number Diff line
@@ -102,3 +102,24 @@ t1 CREATE TABLE `t1` ( 
  `i` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

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/'

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/'

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

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;

mysql-test/t/myisam.test

+0 −37
Original line number Diff line number Diff line
@@ -762,41 +762,4 @@ UPDATE t1 AS ta1,t1 AS ta2 SET ta1.b='aaaaaa',ta2.b='bbbbbb'; 
SELECT * FROM t1;

DROP TABLE t1;



#

# Bug#8706 - temporary table with data directory option fails

#

connect (session1,localhost,root,,);

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;

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/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;

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



connection session1;

select * from t1;

disconnect session1;

connection session2;

select * from t1;

disconnect session2;

connection default;

select * from t1;

drop table t1;



# End of 4.1 tests

mysql-test/t/symlink.test

+37 −0
Original line number Diff line number Diff line
@@ -133,4 +133,41 @@ enable_query_log; 
show create table t1;

drop table t1;



#

# Bug#8706 - temporary table with data directory option fails

#

connect (session1,localhost,root,,);

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;

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/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;

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



connection session1;

select * from t1;

disconnect session1;

connection session2;

select * from t1;

disconnect session2;

connection default;

select * from t1;

drop table t1;



# End of 4.1 tests