diff options
| author | sasha@mysql.sashanet.com <> | 2000-09-15 11:00:35 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-09-15 11:00:35 -0600 |
| commit | 44bc3f9b0e85ad10b47bfe5186e195a14dac8fe2 (patch) | |
| tree | 993dd4ef4b73bf6fb7507f208aa766bc528400e9 /sql/lex.h | |
| parent | 0a087649ec06ff578f7b48e754e094c9cf26f664 (diff) | |
| parent | 5d1388487646c5f607069b10c95539e5b1674df8 (diff) | |
| download | mariadb-git-44bc3f9b0e85ad10b47bfe5186e195a14dac8fe2.tar.gz | |
merge of conflicts
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h index 5ea58c4cd80..09f09319f88 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -299,11 +299,12 @@ static SYMBOL symbols[] = { { "TRAILING", SYM(TRAILING),0,0}, { "TO", SYM(TO_SYM),0,0}, { "TYPE", SYM(TYPE_SYM),0,0}, - { "USE", SYM(USE_SYM),0,0}, - { "USING", SYM(USING),0,0}, + { "UNION", SYM(UNION_SYM),0,0}, { "UNIQUE", SYM(UNIQUE_SYM),0,0}, { "UNLOCK", SYM(UNLOCK_SYM),0,0}, { "UNSIGNED", SYM(UNSIGNED),0,0}, + { "USE", SYM(USE_SYM),0,0}, + { "USING", SYM(USING),0,0}, { "UPDATE", SYM(UPDATE_SYM),0,0}, { "USAGE", SYM(USAGE),0,0}, { "VALUES", SYM(VALUES),0,0}, |