diff options
| author | unknown <sergefp@mysql.com> | 2004-04-05 19:52:10 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-04-05 19:52:10 +0400 |
| commit | fbfdff7fb0b0e508db55151480c0135376b2bcd2 (patch) | |
| tree | 407b4365ecfe2d3c7bbae1190bc79ebb9fc9ba5c /sql/lex.h | |
| parent | 66de313563a74099d416767fec884ab590530d31 (diff) | |
| parent | ef8a5401f146e0aa17d9cc342c52a82e16e7c6ef (diff) | |
| download | mariadb-git-fbfdff7fb0b0e508db55151480c0135376b2bcd2.tar.gz | |
Post-merge fixes
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 94ea0295f05..3274d544744 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -133,6 +133,7 @@ static SYMBOL symbols[] = { { "DAY_MICROSECOND", SYM(DAY_MICROSECOND_SYM)}, { "DAY_MINUTE", SYM(DAY_MINUTE_SYM)}, { "DAY_SECOND", SYM(DAY_SECOND_SYM)}, + { "DEALLOCATE", SYM(DEALLOCATE_SYM)}, { "DEC", SYM(DECIMAL_SYM)}, { "DECIMAL", SYM(DECIMAL_SYM)}, { "DEFAULT", SYM(DEFAULT)}, @@ -322,6 +323,7 @@ static SYMBOL symbols[] = { { "POINT", SYM(POINT_SYM)}, { "POLYGON", SYM(POLYGON)}, { "PRECISION", SYM(PRECISION)}, + { "PREPARE", SYM(PREPARE_SYM)}, { "PREV", SYM(PREV_SYM)}, { "PRIMARY", SYM(PRIMARY_SYM)}, { "PRIVILEGES", SYM(PRIVILEGES)}, |