summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-03-03 12:36:27 -0800
committerunknown <jimw@mysql.com>2005-03-03 12:36:27 -0800
commit92895d00527f62a57ed569f85df01dbf4f0db9c3 (patch)
tree89eeac805ed178f5d13e9a4e2f810ad207ddebcc
parentaa52954f6f43fc1fd6e35bda0dfecf1658720942 (diff)
downloadmariadb-git-92895d00527f62a57ed569f85df01dbf4f0db9c3.tar.gz
Fix symlink test to avoid filenames with paths
mysql-test/r/symlink.result: Update test results mysql-test/t/symlink.test: Fix test to avoid filenames including path in results
-rw-r--r--mysql-test/r/symlink.result2
-rw-r--r--mysql-test/t/symlink.test4
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index 50210d82c69..26612ec81fd 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -84,14 +84,12 @@ t1 CREATE TABLE `t1` (
`b` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
-create table t1 (i int) data directory = "/home/jimw/my/mysql-4.1-8707/mysql-test/var/master-data/test/";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
-create table t1 (i int) index directory = "/home/jimw/my/mysql-4.1-8707/mysql-test/var/master-data/test/";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
index b53be62861e..ddde5171200 100644
--- a/mysql-test/t/symlink.test
+++ b/mysql-test/t/symlink.test
@@ -120,9 +120,13 @@ drop table t1;
# Test specifying DATA DIRECTORY that is the same as what would normally
# have been chosen. (Bug #8707)
#
+disable_query_log;
eval create table t1 (i int) data directory = "$MYSQL_TEST_DIR/var/master-data/test/";
+enable_query_log;
show create table t1;
drop table t1;
+disable_query_log;
eval create table t1 (i int) index directory = "$MYSQL_TEST_DIR/var/master-data/test/";
+enable_query_log;
show create table t1;
drop table t1;