summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-02-06 16:28:05 +0100
committerSergei Golubchik <sergii@pisem.net>2014-02-06 16:28:05 +0100
commitc73718d917e903bddf7059cd8a515066f04311d1 (patch)
tree14bfdf1ae9ee4df8e7577c72c0464e2c48c98679 /mysql-test
parentb7b991add01a0bb546c3f19e37add13c4e6854fc (diff)
downloadmariadb-git-c73718d917e903bddf7059cd8a515066f04311d1.tar.gz
fix tests for solaris - different errno numbers and/or different errno messages
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/federated/federated.test1
-rw-r--r--mysql-test/suite/rpl/t/rpl_drop_db.test4
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/suite/federated/federated.test b/mysql-test/suite/federated/federated.test
index cb14dc2a239..0cb0551d23e 100644
--- a/mysql-test/suite/federated/federated.test
+++ b/mysql-test/suite/federated/federated.test
@@ -6,6 +6,7 @@ connection master;
#
--error 1
CREATE TABLE t1 (a INT) ENGINE=FEDERATED CONNECTION='non_existing';
+--replace_result "Not owner" "Operation not permitted"
SHOW WARNINGS;
#
diff --git a/mysql-test/suite/rpl/t/rpl_drop_db.test b/mysql-test/suite/rpl/t/rpl_drop_db.test
index ac859b4655a..a67850a66dd 100644
--- a/mysql-test/suite/rpl/t/rpl_drop_db.test
+++ b/mysql-test/suite/rpl/t/rpl_drop_db.test
@@ -13,7 +13,7 @@ insert into mysqltest1.t1 values (1);
select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
create table mysqltest1.t2 (n int);
create table mysqltest1.t3 (n int);
---replace_result \\ / 66 39
+--replace_result \\ / 66 39 17 39 "File exists" "Directory not empty"
--error 1010
drop database mysqltest1;
use mysqltest1;
@@ -30,7 +30,7 @@ while ($1)
}
--enable_query_log
---replace_result \\ / 66 39
+--replace_result \\ / 66 39 17 39 "File exists" "Directory not empty"
--error 1010
drop database mysqltest1;
use mysqltest1;