diff options
| author | Patrick Crews <patrick.crews@sun.com> | 2008-09-30 15:32:35 -0400 |
|---|---|---|
| committer | Patrick Crews <patrick.crews@sun.com> | 2008-09-30 15:32:35 -0400 |
| commit | 99abc81c5f0fecee5d9b2d93e685c8b512c5e175 (patch) | |
| tree | a8fc373533c7115c1892a90aaa1d69c37f11e62a /mysql-test/t/symlink.test | |
| parent | a938da539cf2313dc3c1b94deb099c7d6eab4c5c (diff) | |
| parent | c7f32b02ac38292810bdb39b14db55af5fcdaabf (diff) | |
| download | mariadb-git-99abc81c5f0fecee5d9b2d93e685c8b512c5e175.tar.gz | |
Merge 5.0 -> 5.1
Diffstat (limited to 'mysql-test/t/symlink.test')
| -rw-r--r-- | mysql-test/t/symlink.test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 1371a470ffd..3c7e9b658f3 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' @@ -195,19 +195,19 @@ DROP TABLE t1; # Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY # --replace_result $MYSQLTEST_VARDIR TEST_DIR ---error 1210 +--error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql'; --replace_result $MYSQLTEST_VARDIR TEST_DIR ---error 1210 +--error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/test'; --replace_result $MYSQLTEST_VARDIR TEST_DIR ---error 1210 +--error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/'; --replace_result $MYSQLTEST_VARDIR TEST_DIR ---error 1210 +--error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data'; --replace_result $MYSQLTEST_VARDIR TEST_DIR |