diff options
| author | unknown <holyfoot@mysql.com> | 2006-02-17 11:26:03 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-02-17 11:26:03 +0400 |
| commit | 53cf5e6000006dc451740fb175a0da70854b81f6 (patch) | |
| tree | adb59b5b5c6cb490762c59bb9311cf7d388db593 /sql/lex.h | |
| parent | aec6b1765bbf07ae1acbdc601944cbaac8416fd4 (diff) | |
| parent | 96b4449370a00db075ac30b3de07510e3aa80d9e (diff) | |
| download | mariadb-git-53cf5e6000006dc451740fb175a0da70854b81f6.tar.gz | |
Merging 5.0->5.1
include/myisam.h:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_table.cc:
Auto merged
include/my_base.h:
merging
scripts/Makefile.am:
merging
sql/handler.cc:
merging
sql/share/errmsg.txt:
merging
sql/sql_yacc.yy:
merging
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 b52be29457f..574d7036c8a 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -552,6 +552,7 @@ static SYMBOL symbols[] = { { "UNSIGNED", SYM(UNSIGNED)}, { "UNTIL", SYM(UNTIL_SYM)}, { "UPDATE", SYM(UPDATE_SYM)}, + { "UPGRADE", SYM(UPGRADE_SYM)}, { "USAGE", SYM(USAGE)}, { "USE", SYM(USE_SYM)}, { "USER", SYM(USER)}, |