diff options
author | Patrick Crews <patrick.crews@sun.com> | 2008-09-23 05:24:32 -0400 |
---|---|---|
committer | Patrick Crews <patrick.crews@sun.com> | 2008-09-23 05:24:32 -0400 |
commit | 51c40c5bd07b64a932e35f58f810e08b42b45b55 (patch) | |
tree | 6a860c10e41d7328be6ebca6e210444f7d5eccd0 /mysql-test/t/symlink.test | |
parent | 2a419a562704c276127991e0c416c8d2745657a7 (diff) | |
parent | 04ecf17b7715cdd566e403204e150de4f5766cb5 (diff) | |
download | mariadb-git-51c40c5bd07b64a932e35f58f810e08b42b45b55.tar.gz |
Bug#38311 - Fix of some cruft from remove_files in ndb_autodiscover.test, clean up of distinct.test,
and replacing error numbers with error names.
Diffstat (limited to 'mysql-test/t/symlink.test')
-rw-r--r-- | mysql-test/t/symlink.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 8ce1bca1ec1..4ea41046c2f 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -80,7 +80,7 @@ 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' @@ -204,19 +204,19 @@ deallocate prepare stmt; # Bug#32167 another privilege bypass with DATA/INDEX DIRECORY # --replace_result $MYSQL_TEST_DIR TEST_DIR ---error 1,1210 +--error 1,ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/test'; --replace_result $MYSQL_TEST_DIR TEST_DIR ---error 1,1210 +--error 1,ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/'; --replace_result $MYSQL_TEST_DIR TEST_DIR ---error 1,1210 +--error 1,ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data'; --replace_result $MYSQL_TEST_DIR TEST_DIR ---error 1,1210 +--error 1,ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data_var'; |