diff --git a/src/sql/parser/sql_parser_mysql_mode.l b/src/sql/parser/sql_parser_mysql_mode.l index 5837f0528..7693d56d4 100755 --- a/src/sql/parser/sql_parser_mysql_mode.l +++ b/src/sql/parser/sql_parser_mysql_mode.l @@ -64,7 +64,7 @@ c_cmt_end \*+\/ comment ({sql_comment}) identifier (([A-Za-z0-9$_]|{UTF8_GB_CHAR})*) system_variable (@@[A-Za-z_][A-Za-z0-9_]*)|(@@[`][`A-Za-z_][`A-Za-z_]*) -user_variable (@[A-Za-z0-9_\.$]*)|(@[`'\"][`'\"A-Za-z0-9_\.$/%@#\-!,;&~\:\?\+\|\^\*\{\}\(\)\[\]]*) +user_variable (@[A-Za-z0-9_\.$]*)|(@[`'\"][`'\"A-Za-z0-9_\.$/%]*) version_num ([0-9]+\.+[0-9]*) int_num [0-9]+ client_version \([0-9]+(\.[0-9]+)*\) diff --git a/tools/deploy/mysql_test/test_suite/pl/r/mysql/sp_mysql.result b/tools/deploy/mysql_test/test_suite/pl/r/mysql/sp_mysql.result index 9a532bf09..34b4a1b95 100644 --- a/tools/deploy/mysql_test/test_suite/pl/r/mysql/sp_mysql.result +++ b/tools/deploy/mysql_test/test_suite/pl/r/mysql/sp_mysql.result @@ -1946,8 +1946,6 @@ test bug2267_4 PROCEDURE 'admin'@'%' 0000-00-00 00:00:00 0000-00-00 00:00:00 DEF call bug2267_2()| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation test bug2267_4 FUNCTION 'admin'@'%' 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER NULL utf8mb4 utf8mb4_general_ci utf8mb4_general_ci -test bug2564_3 FUNCTION 'admin'@'%' 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER NULL utf8mb4 utf8mb4_general_ci utf8mb4_general_ci -test bug2564_4 FUNCTION 'admin'@'%' 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER NULL utf8mb4 utf8mb4_general_ci utf8mb4_general_ci call bug2267_3()| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation bug2267_1 CREATE DEFINER = admin@% PROCEDURE `test`.`bug2267_1`