diff options
author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:34:13 +0300 |
---|---|---|
committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:34:13 +0300 |
commit | 6c6c3af6aac428df8a934beeba15cc4ce77cbe01 (patch) | |
tree | 2f8241944db8952e6a54a417414773dd0b5b0b4e /mysql-test/t/func_analyse.test | |
parent | b4f1f42062d108230b62ad49fedd93ee6e38e168 (diff) | |
parent | c7c2f8d4a0dedd52795b7f8a6971c35ea46cc016 (diff) | |
download | mariadb-git-10.2-test1234.tar.gz |
Merge branch '10.2' into 10.2-mdev986410.2-test1234
Diffstat (limited to 'mysql-test/t/func_analyse.test')
-rw-r--r-- | mysql-test/t/func_analyse.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/func_analyse.test b/mysql-test/t/func_analyse.test index 6c30c0ca630..d99f5c0fa9a 100644 --- a/mysql-test/t/func_analyse.test +++ b/mysql-test/t/func_analyse.test @@ -165,7 +165,7 @@ DROP TABLE t1, t2; ((SELECT 1 FROM DUAL PROCEDURE ANALYSE())); # TODO: ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT * FROM t1 UNION SELECT * FROM t1 PROCEDURE analyse(); --echo # |