diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-11-03 14:51:52 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-11-03 14:51:52 +0000 |
| commit | 1602ffb8ab4e04d17db995a22bb6c33a5a638881 (patch) | |
| tree | 5ce55f17b2d438aae3b681dd29ed0d3cde584b2e /sql | |
| parent | a5eba94a1d8967d5a8c7e8d3d398a2426453f508 (diff) | |
| download | mariadb-git-1602ffb8ab4e04d17db995a22bb6c33a5a638881.tar.gz | |
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 are allowed 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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 396c426f29f..66d74a398fb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -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 {} |