diff options
| author | unknown <sergefp@mysql.com> | 2004-06-04 05:37:14 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-06-04 05:37:14 +0400 |
| commit | e9c4cea9dea039c79c99940007833d7dde2c59dc (patch) | |
| tree | c875aca91162dc7f6890e041f5c1faa5dcf5c929 /sql/lex.h | |
| parent | f0beff16f37c2adee70d8226190b4c529e8b14b1 (diff) | |
| parent | 948903fc4f47af2cf328424931a64030bec44442 (diff) | |
| download | mariadb-git-e9c4cea9dea039c79c99940007833d7dde2c59dc.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
sql/lex.h:
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_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 64cc6b57464..fde5076a25e 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -311,6 +311,7 @@ static SYMBOL symbols[] = { { "OFFSET", SYM(OFFSET_SYM)}, { "OLD_PASSWORD", SYM(OLD_PASSWORD)}, { "ON", SYM(ON)}, + { "ONE_SHOT", SYM(ONE_SHOT_SYM)}, { "OPEN", SYM(OPEN_SYM)}, { "OPTIMIZE", SYM(OPTIMIZE)}, { "OPTION", SYM(OPTION)}, |