summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <thek@kpdesk.mysql.com>2006-12-14 13:23:31 +0100
committerunknown <thek@kpdesk.mysql.com>2006-12-14 13:23:31 +0100
commite608076f29c6aa455ea4a411f998fe47dcad67a8 (patch)
tree379e94114d50fabaadea27486aba05452326c562 /mysql-test/r
parentf6e27d870025467ba3533b89c3fb9dcb780ea603 (diff)
downloadmariadb-git-e608076f29c6aa455ea4a411f998fe47dcad67a8.tar.gz
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. mysql-test/r/myisam.result: moved test from myisam to symlink; new result file mysql-test/r/symlink.result: moved test from myisam to symlink; new result file mysql-test/t/myisam.test: moved test from myisam to symlink mysql-test/t/symlink.test: moved test from myisam to symlink
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/myisam.result21
-rw-r--r--mysql-test/r/symlink.result21
2 files changed, 21 insertions, 21 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 05f72b22ed1..36356351601 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -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;
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index f6779689133..b104ce50a56 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -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;