diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
commit | 02979daab48d871e8c43a227b8f4462128439f17 (patch) | |
tree | 21dba14f0073df2328677ed0a90a3596f043bdeb /mysql-test/main/sp.test | |
parent | efbfcc8b73d9fd8bafd86ab387e0c1edd39e208b (diff) | |
parent | 192aa295b4bc877d0fed24154c57304c3f789179 (diff) | |
download | mariadb-git-02979daab48d871e8c43a227b8f4462128439f17.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/sp.test')
-rw-r--r-- | mysql-test/main/sp.test | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test index 920b09077d3..7f413c4f665 100644 --- a/mysql-test/main/sp.test +++ b/mysql-test/main/sp.test @@ -10322,6 +10322,32 @@ drop procedure p4; drop table t1; set @@sql_mode=@save_sql_mode; +--echo # +--echo # MDEV-17363 Compressed columns cannot be restored from dump +--echo # COMPRESSED conflicted between data type and SP label, +--echo # so it's not allowed as an SP label any more. +--echo # + +DELIMITER $$; +CREATE FUNCTION f1() RETURNS TEXT COMPRESSED +BEGIN + RETURN ''; +END; +$$ +DELIMITER ;$$ +SHOW CREATE FUNCTION f1; +DROP FUNCTION f1; + +DELIMITER $$; +--error ER_PARSE_ERROR +CREATE FUNCTION f1() RETURNS TEXT +COMPRESSED: +BEGIN + RETURN ''; +END; +$$ +DELIMITER ;$$ + --echo # End of 10.3 tests |