diff options
| author | Mats Kindahl <mats@sun.com> | 2008-10-23 21:27:09 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2008-10-23 21:27:09 +0200 |
| commit | 1f29c525818b421bda822550a92cb6f7092dcec8 (patch) | |
| tree | 09212d65be943c6c5dfd6d6a834841683d81f9f8 /mysql-test/t/symlink.test | |
| parent | d88716c2cf990ae8e6b2de75612219b22259b3cf (diff) | |
| parent | 3c76b5a10405a019422a6617be8e6b22a8da8953 (diff) | |
| download | mariadb-git-1f29c525818b421bda822550a92cb6f7092dcec8.tar.gz | |
Merging 5.1 main into 5.1-rpl
Diffstat (limited to 'mysql-test/t/symlink.test')
| -rw-r--r-- | mysql-test/t/symlink.test | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 3001775f204..b1186b7438b 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -74,12 +74,12 @@ create database mysqltest; create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist"; # temporarily disabled as it returns different result in the embedded server -# --error 1210, 1210 +# --error ER_WRONG_ARGUMENTS, ER_WRONG_ARGUMENTS # create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path"; # Should fail becasue the file t9.MYI already exist in 'run' --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---error 1,1,1105 +--error 1,1,ER_UNKNOWN_ERROR eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="$MYSQLTEST_VARDIR/run"; # Should fail becasue the file t9.MYD already exist in 'tmp' @@ -197,22 +197,22 @@ DROP TABLE t1; # let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR ---error 1210 +--error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) INDEX DIRECTORY='$MYSQLD_DATADIR/mysql'; --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR ---error 1210 +--error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLD_DATADIR/test'; --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR ---error 1210 +--error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLD_DATADIR/'; --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR ---error 1210 +--error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) INDEX DIRECTORY='$MYSQLD_DATADIR'; @@ -220,6 +220,7 @@ INDEX DIRECTORY='$MYSQLD_DATADIR'; --error 1 eval CREATE TABLE t1(a INT) INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data_var'; + # BUG#25677 - With --skip-symbolic-links option on, DATA DIRECTORY clause is # silently ignored # |