diff options
author | Michael Widenius <monty@mariadb.org> | 2014-03-23 17:00:29 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2014-03-23 17:00:29 +0200 |
commit | 39e6083e35459c9c8b22d37aaa2b74545884c7b0 (patch) | |
tree | d2173f06d0676cf55be448632ceae58f18a2ff56 /mysql-test/suite/archive/archive_symlink.result | |
parent | 6214f4e51ccfc2c8cbb82549559e61f4a436996b (diff) | |
download | mariadb-git-39e6083e35459c9c8b22d37aaa2b74545884c7b0.tar.gz |
MDEV-5818: MySQL WL#6145: Separate the dependence of DATA DIRECTORY from symbolic links
Copied relevant test cases and code from the MySQL 5.6 tree
Testing of my_use_symdir moved to engines.
mysql-test/r/partition_windows.result:
Updated result file
mysql-test/suite/archive/archive_no_symlink-master.opt:
Testing of symlinks with archive
mysql-test/suite/archive/archive_no_symlink.result:
Testing of symlinks with archive
mysql-test/suite/archive/archive_no_symlink.test:
Testing of symlinks with archive
mysql-test/suite/archive/archive_symlink.result:
Testing of symlinks with archive
mysql-test/suite/archive/archive_symlink.test:
Testing of symlinks with archive
sql/log_event.cc:
Updated comment
sql/partition_info.cc:
Don't test my_use_symdir here
sql/sql_parse.cc:
Updated comment
sql/sql_table.cc:
Don't test my_use_symdir here
sql/table.cc:
Added more DBUG_PRINT
storage/archive/ha_archive.cc:
Give warnings for index_file_name and if we can't use data directory
storage/myisam/ha_myisam.cc:
Give warnings if we can't use data directory or index directory
Diffstat (limited to 'mysql-test/suite/archive/archive_symlink.result')
-rw-r--r-- | mysql-test/suite/archive/archive_symlink.result | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/mysql-test/suite/archive/archive_symlink.result b/mysql-test/suite/archive/archive_symlink.result new file mode 100644 index 00000000000..de5c4c071d6 --- /dev/null +++ b/mysql-test/suite/archive/archive_symlink.result @@ -0,0 +1,57 @@ +# +# Archive can only use an existing directory for DATA DIRECTORY. +# +CREATE TABLE t1 (a int AUTO_INCREMENT KEY, b char(30)) +ENGINE archive DATA DIRECTORY = 'MYSQL_TMP_DIR/archive' INDEX DIRECTORY = 'MYSQL_TMP_DIR/archive'; +ERROR HY000: Can't create table `test`.`t1` (errno: 2 "No such file or directory") +# +# mkdir MYSQL_TMP_DIR/archive and try again... +# Archive will use a symlink for DATA DIRECTORY but ignore INDEX DIRECTORY. +# +CREATE TABLE t1 (a int AUTO_INCREMENT KEY, b char(30)) +ENGINE archive DATA DIRECTORY = 'MYSQL_TMP_DIR/archive' INDEX DIRECTORY = 'MYSQL_TMP_DIR/archive'; +Warnings: +Warning 1618 <INDEX DIRECTORY> option ignored +INSERT INTO t1 VALUES (NULL, "blue"); +INSERT INTO t1 VALUES (NULL, "red"); +INSERT INTO t1 VALUES (NULL, "yellow"); +# Checking if archive file exists where we specified in DATA DIRECTORY +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL AUTO_INCREMENT, + `b` char(30) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=ARCHIVE AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/archive/' +DROP TABLE t1; +# +# Be sure SQL MODE "NO_DIR_IN_CREATE" prevents the use of DATA DIRECTORY +# +SET @org_mode=@@sql_mode; +SET @@sql_mode='NO_DIR_IN_CREATE'; +SELECT @@sql_mode; +@@sql_mode +NO_DIR_IN_CREATE +CREATE TABLE t1 (a int AUTO_INCREMENT KEY, b char(30)) +ENGINE archive DATA DIRECTORY = 'MYSQL_TMP_DIR/archive'; +Warnings: +Warning 1618 <DATA DIRECTORY> option ignored +INSERT INTO t1 VALUES (NULL, "blue"); +INSERT INTO t1 VALUES (NULL, "red"); +INSERT INTO t1 VALUES (NULL, "yellow"); +# Checking if archive file exists in --datadir since DATA DIRECTORY was ignored. +DROP TABLE t1; +set @@sql_mode=@org_mode; +# +# MySQL engine does not allow DATA DIRECTORY to be +# within --datadir for any engine, including Archive +# +CREATE TABLE t1 (a int AUTO_INCREMENT KEY, b char(30)) +ENGINE archive DATA DIRECTORY 'MYSQLD_DATADIR/test'; +ERROR HY000: Incorrect arguments to DATA DIRECTORY +CREATE TABLE t1 (c1 int(10), PRIMARY KEY (c1)) +ENGINE archive INDEX DIRECTORY 'MYSQLD_DATADIR/test'; +ERROR HY000: Incorrect arguments to INDEX DIRECTORY +# +# Cleanup +# |