diff options
author | Sergei Golubchik <serg@mariadb.org> | 2014-11-08 17:37:19 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-04 16:09:34 +0100 |
commit | 227510e039b4ec6bff3096a4b9b39847551dab1a (patch) | |
tree | 2c40cbba45ca53e688d3f5cd388dbcd032c82984 /mysql-test/t/sp-ucs2.test | |
parent | d1522af72dad1965b8a8a37415545014ba743f49 (diff) | |
download | mariadb-git-227510e039b4ec6bff3096a4b9b39847551dab1a.tar.gz |
parser cleanup: don't store field properties in LEX, use Create_field directly
length/dec/charset are still in LEX, because they're also used
for CAST and dynamic columns.
also
1. fix "MDEV-7041 COLLATION(CAST('a' AS CHAR BINARY)) returns a wrong result"
2. allow BINARY modifier in stored function RETURN clause
3. allow "COLLATION without CHARSET" in SP/SF (parameters, RETURN, DECLARE)
4. print correct variable name in error messages for stored routine parameters
Diffstat (limited to 'mysql-test/t/sp-ucs2.test')
-rw-r--r-- | mysql-test/t/sp-ucs2.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/sp-ucs2.test b/mysql-test/t/sp-ucs2.test index f6f70c3c103..3532169e5a1 100644 --- a/mysql-test/t/sp-ucs2.test +++ b/mysql-test/t/sp-ucs2.test @@ -114,7 +114,7 @@ DROP FUNCTION f1| # # COLLATE with no CHARACTER SET in IN param # ---error ER_NOT_SUPPORTED_YET +--error ER_COLLATION_CHARSET_MISMATCH CREATE FUNCTION f(f1 VARCHAR(64) COLLATE ucs2_unicode_ci) RETURNS VARCHAR(64) CHARACTER SET ucs2 BEGIN @@ -125,7 +125,7 @@ END| # # COLLATE with no CHARACTER SET in RETURNS # ---error ER_NOT_SUPPORTED_YET +--error ER_COLLATION_CHARSET_MISMATCH CREATE FUNCTION f(f1 VARCHAR(64) CHARACTER SET ucs2) RETURNS VARCHAR(64) COLLATE ucs2_unicode_ci BEGIN @@ -136,7 +136,7 @@ END| # # COLLATE with no CHARACTER SET in DECLARE # ---error ER_NOT_SUPPORTED_YET +--error ER_COLLATION_CHARSET_MISMATCH CREATE FUNCTION f(f1 VARCHAR(64) CHARACTER SET ucs2) RETURNS VARCHAR(64) CHARACTER SET ucs2 BEGIN |