diff options
author | Elena Stepanova <elenst@ubuntu11.home> | 2012-07-16 06:14:53 +0400 |
---|---|---|
committer | Elena Stepanova <elenst@ubuntu11.home> | 2012-07-16 06:14:53 +0400 |
commit | 403cac0fe710bbd65a65f5b409cff6194ce6bace (patch) | |
tree | 8153be180c7d80b44e7b0bbf47ae8c9f7cc99e19 /mysql-test | |
parent | 49da8e7e212ec2ba739b9a7e2f512f1f71c62f1e (diff) | |
download | mariadb-git-403cac0fe710bbd65a65f5b409cff6194ce6bace.tar.gz |
Allow multiple error codes inside a variable in --error command
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/mysqltest.result | 1 | ||||
-rw-r--r-- | mysql-test/t/mysqltest.test | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 25345227d59..fdb3029059f 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -690,6 +690,7 @@ Got one of the listed errors insert into t1 values ("Abcd"); Got one of the listed errors garbage; +SELECT * FROM non_existing_table; drop table t2; create table t1 ( f1 char(10)); insert into t1 values ("Abcd"); diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index a7585bea4f8..ffbec36873e 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -2120,6 +2120,11 @@ insert into t1 values ("Abcd"); --error $errno1,ER_PARSE_ERROR garbage; +let $errno_multi = $errno1,ER_NO_SUCH_TABLE,$errno2,1062; + +--error $errno_multi +SELECT * FROM non_existing_table; + drop table t2; |