summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-02-23 13:59:04 -0800
committerjimw@mysql.com <>2005-02-23 13:59:04 -0800
commit3ecabaa9f7c0f6cf5d38391c5e38580d798802fa (patch)
treef51e092086c91300bf59f2ff67c407425d2f51f9 /mysql-test
parenta50be4d42b9ea0cfd6a73c387e0039a6aad3b887 (diff)
downloadmariadb-git-3ecabaa9f7c0f6cf5d38391c5e38580d798802fa.tar.gz
Don't try to create a symlink if the DATA DIRECTORY specified for a table
is the same as the normal datadir for that database. (Bug #8707)
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/symlink.result14
-rw-r--r--mysql-test/t/symlink.test11
2 files changed, 25 insertions, 0 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index 08d75d8b562..50210d82c69 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -84,3 +84,17 @@ 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` (
+ `i` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
index 78c9b68fde5..b53be62861e 100644
--- a/mysql-test/t/symlink.test
+++ b/mysql-test/t/symlink.test
@@ -115,3 +115,14 @@ eval alter table t1 index directory="$MYSQL_TEST_DIR/var/log";
enable_query_log;
show create table t1;
drop table t1;
+
+#
+# Test specifying DATA DIRECTORY that is the same as what would normally
+# have been chosen. (Bug #8707)
+#
+eval create table t1 (i int) data directory = "$MYSQL_TEST_DIR/var/master-data/test/";
+show create table t1;
+drop table t1;
+eval create table t1 (i int) index directory = "$MYSQL_TEST_DIR/var/master-data/test/";
+show create table t1;
+drop table t1;