diff options
author | unknown <serg@serg.mysql.com> | 2001-05-15 20:55:40 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-05-15 20:55:40 +0200 |
commit | 83e3058c3e6ebd1ec2ffa03854eaf1388bb4c484 (patch) | |
tree | 21f17a4416a7c26597c585fb17a174dfc40da50e /sql/lex.h | |
parent | fe983ca7b3eed46e8cda130ad24d86f2609afdfb (diff) | |
parent | 5e52875b8fbce141f7a544da69ecf8c6c23ed6db (diff) | |
download | mariadb-git-83e3058c3e6ebd1ec2ffa03854eaf1388bb4c484.tar.gz |
Merge
Docs/manual.texi:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
SCCS 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 0e10ff4949c..c29c4081787 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -113,6 +113,7 @@ static SYMBOL symbols[] = { { "DELETE", SYM(DELETE_SYM),0,0}, { "DESC", SYM(DESC),0,0}, { "DESCRIBE", SYM(DESCRIBE),0,0}, + { "DISABLE", SYM(DISABLE_SYM),0,0}, { "DISTINCT", SYM(DISTINCT),0,0}, { "DISTINCTROW", SYM(DISTINCT),0,0}, /* Access likes this */ { "DOUBLE", SYM(DOUBLE_SYM),0,0}, @@ -123,6 +124,7 @@ static SYMBOL symbols[] = { { "ELSE", SYM(ELSE),0,0}, { "ESCAPE", SYM(ESCAPE_SYM),0,0}, { "ESCAPED", SYM(ESCAPED),0,0}, + { "ENABLE", SYM(ENABLE_SYM),0,0}, { "ENCLOSED", SYM(ENCLOSED),0,0}, { "ENUM", SYM(ENUM),0,0}, { "EXPLAIN", SYM(DESCRIBE),0,0}, |