From 227510e039b4ec6bff3096a4b9b39847551dab1a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 8 Nov 2014 17:37:19 +0100 Subject: 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 --- mysql-test/t/sp-error.test | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'mysql-test/t/sp-error.test') diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test index 711e639191e..a16ef1205b9 100644 --- a/mysql-test/t/sp-error.test +++ b/mysql-test/t/sp-error.test @@ -2051,13 +2051,8 @@ delimiter ;| --disable_warnings drop function if exists bug20701; --enable_warnings -# -# This was disabled in 5.1.12. See bug #20701 -# When collation support in SP is implemented, then this test should -# be removed. -# ---error ER_NOT_SUPPORTED_YET create function bug20701() returns varchar(25) binary return "test"; +drop function bug20701; create function bug20701() returns varchar(25) return "test"; drop function bug20701; -- cgit v1.2.1