diff options
| author | unknown <konstantin@mysql.com> | 2006-04-23 13:32:38 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-04-23 13:32:38 +0400 |
| commit | 8e28ab1f40e60cbd9837468fc0d357335209f877 (patch) | |
| tree | 3351ae9a9cbc190467e40a1bd0ee706873e10549 /sql/lex.h | |
| parent | dc796fce4d58d902abed624fef9f163a304ecf1a (diff) | |
| parent | 2efefe689057a83cf9d3eefecd05740aa06bd4f2 (diff) | |
| download | mariadb-git-8e28ab1f40e60cbd9837468fc0d357335209f877.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-5.0-root
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
sql/item_func.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/lex.h b/sql/lex.h index 1acfbaac211..68f34d8de93 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -215,9 +215,6 @@ static SYMBOL symbols[] = { { "GEOMETRYCOLLECTION",SYM(GEOMETRYCOLLECTION)}, { "GET_FORMAT", SYM(GET_FORMAT)}, { "GLOBAL", SYM(GLOBAL_SYM)}, -#ifdef SP_GOTO - { "GOTO", SYM(GOTO_SYM)}, -#endif { "GRANT", SYM(GRANT)}, { "GRANTS", SYM(GRANTS)}, { "GROUP", SYM(GROUP)}, @@ -265,10 +262,6 @@ static SYMBOL symbols[] = { { "KEY", SYM(KEY_SYM)}, { "KEYS", SYM(KEYS)}, { "KILL", SYM(KILL_SYM)}, -#ifdef SP_GOTO - /* QQ This will go away when the GOTO label syntax is fixed */ - { "LABEL", SYM(LABEL_SYM)}, -#endif { "LANGUAGE", SYM(LANGUAGE_SYM)}, { "LAST", SYM(LAST_SYM)}, { "LEADING", SYM(LEADING)}, |