From: Luis Soares Date: November 2 2010 11:48am Subject: bzr commit into mysql-5.5-bugteam branch (luis.soares:3108) Bug#57899 List-Archive: http://lists.mysql.com/commits/122522 X-Bug: 57899 Message-Id: <201011021149.oA22gYX6011923@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3483257800768288663==" --===============3483257800768288663== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/lsoares/Workspace/bzr/work/bugfixing/57899/mysql-5.5-bugteam/ based on revid:tor.didriksen@stripped 3108 Luis Soares 2010-11-02 BUG#57899: Certain reserved words should not be reserved In MySQL 5.5 the new reserved words include: SLOW as in FLUSH SLOW LOGS GENERAL as in FLUSH GENERAL LOGS IGNORE_SERVER_IDS as in CHANGE MASTER ... IGNORE_SERVER_IDS MASTER_HEARTBEAT_PERIOD as in CHANGE MASTER ... MASTER_HEARTBEAT_PERIOD These are not reserved words in standard SQL, or in Oracle 11g, and as such, may affect existing applications. We fix this by adding the new words to the list of keywords that we allow for labels in SPs. @ mysql-test/t/keywords.test Test case that checks that the target words can be used for naming fields in a table or as local routine variable names. modified: mysql-test/r/keywords.result mysql-test/t/keywords.test sql/sql_yacc.yy === modified file 'mysql-test/r/keywords.result' --- a/mysql-test/r/keywords.result 2007-02-23 11:13:55 +0000 +++ b/mysql-test/r/keywords.result 2010-11-02 11:48:29 +0000 @@ -45,3 +45,22 @@ p1 max=1 drop procedure p1; drop table t1; +CREATE TABLE t1 (slow INT, general INT, ignore_server_ids INT, master_heartbeat_period INT); +INSERT INTO t1 VALUES (1,2,3,4); +CREATE PROCEDURE p1() +BEGIN +DECLARE slow INT; +DECLARE general INT; +DECLARE ignore_server_ids INT; +DECLARE master_heartbeat_period INT; +SELECT max(t1.slow) INTO slow FROM t1; +SELECT max(t1.general) INTO general FROM t1; +SELECT max(t1.ignore_server_ids) INTO ignore_server_ids FROM t1; +SELECT max(t1.master_heartbeat_period) INTO master_heartbeat_period FROM t1; +SELECT slow, general, ignore_server_ids, master_heartbeat_period; +END| +CALL p1(); +slow general ignore_server_ids master_heartbeat_period +1 2 3 4 +DROP PROCEDURE p1; +DROP TABLE t1; === modified file 'mysql-test/t/keywords.test' --- a/mysql-test/t/keywords.test 2007-02-23 11:13:55 +0000 +++ b/mysql-test/t/keywords.test 2010-11-02 11:48:29 +0000 @@ -62,5 +62,31 @@ call p1(); drop procedure p1; drop table t1; - # End of 5.0 tests + +# +# BUG#57899: Certain reserved words should not be reserved +# + +CREATE TABLE t1 (slow INT, general INT, ignore_server_ids INT, master_heartbeat_period INT); +INSERT INTO t1 VALUES (1,2,3,4); +DELIMITER |; +CREATE PROCEDURE p1() +BEGIN + DECLARE slow INT; + DECLARE general INT; + DECLARE ignore_server_ids INT; + DECLARE master_heartbeat_period INT; + + SELECT max(t1.slow) INTO slow FROM t1; + SELECT max(t1.general) INTO general FROM t1; + SELECT max(t1.ignore_server_ids) INTO ignore_server_ids FROM t1; + SELECT max(t1.master_heartbeat_period) INTO master_heartbeat_period FROM t1; + + SELECT slow, general, ignore_server_ids, master_heartbeat_period; + +END| +DELIMITER ;| +CALL p1(); +DROP PROCEDURE p1; +DROP TABLE t1; === modified file 'sql/sql_yacc.yy' --- a/sql/sql_yacc.yy 2010-10-13 06:27:03 +0000 +++ b/sql/sql_yacc.yy 2010-11-02 11:48:29 +0000 @@ -12497,6 +12497,7 @@ keyword_sp: | FILE_SYM {} | FIRST_SYM {} | FIXED_SYM {} + | GENERAL {} | GEOMETRY_SYM {} | GEOMETRYCOLLECTION {} | GET_FORMAT {} @@ -12506,6 +12507,7 @@ keyword_sp: | HOSTS_SYM {} | HOUR_SYM {} | IDENTIFIED_SYM {} + | IGNORE_SERVER_IDS_SYM {} | INVOKER_SYM {} | IMPORT {} | INDEXES {} @@ -12528,6 +12530,7 @@ keyword_sp: | LOGS_SYM {} | MAX_ROWS {} | MASTER_SYM {} + | MASTER_HEARTBEAT_PERIOD_SYM {} | MASTER_HOST_SYM {} | MASTER_PORT_SYM {} | MASTER_LOG_FILE_SYM {} @@ -12633,6 +12636,7 @@ keyword_sp: | SIMPLE_SYM {} | SHARE_SYM {} | SHUTDOWN {} + | SLOW {} | SNAPSHOT_SYM {} | SOUNDS_SYM {} | SOURCE_SYM {} --===============3483257800768288663== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/luis.soares@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: luis.soares@stripped # target_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\ # /57899/mysql-5.5-bugteam/ # testament_sha1: 82a76089d0e8f9ed62ba4fecc56cf30f80f22e46 # timestamp: 2010-11-02 11:48:42 +0000 # source_branch: /home/lsoares/Workspace/bzr/clones/mysql-5.5-bugteam # base_revision_id: tor.didriksen@stripped\ # c2igv7wk5clmuyaz # # Begin bundle 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 B7QH+LuSKcKEh38+x+g= --===============3483257800768288663==--