summaryrefslogtreecommitdiff
path: root/mysql-test/t/errors.test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-06-30 10:28:01 +0200
committerSergei Golubchik <serg@mariadb.org>2017-06-30 10:28:01 +0200
commit273e0f663e5a7254aa4e956572f6faa97e5579c9 (patch)
treef71aa227dd91e8dfe04e506a168bf68dd0002032 /mysql-test/t/errors.test
parent330792f3c3c5007dd92912b9d1d32da178b5b9fd (diff)
downloadmariadb-git-273e0f663e5a7254aa4e956572f6faa97e5579c9.tar.gz
MDEV-13179 main.errors fails in buildbot and outside with wrong errno 1290
Diffstat (limited to 'mysql-test/t/errors.test')
-rw-r--r--mysql-test/t/errors.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/errors.test b/mysql-test/t/errors.test
index 9d5cbef89b1..d1d83248df4 100644
--- a/mysql-test/t/errors.test
+++ b/mysql-test/t/errors.test
@@ -204,6 +204,6 @@ drop table t1;
# errors caused by max_session_mem_used
#
set max_session_mem_used = 8192;
---error ER_SQL_DISCOVER_ERROR
+--error ER_SQL_DISCOVER_ERROR,ER_OPTION_PREVENTS_STATEMENT
select * from seq_1_to_1000;
set global max_session_mem_used = default;