diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-10 18:22:14 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-10 18:22:14 +0200 |
| commit | c20a4e6e026bdb4f5aed1402ea582ce4a2c5a393 (patch) | |
| tree | e653ab85c004942486ac67e01503e235b0a37894 /sql/lex.h | |
| parent | 2031478ad9792cb0694108d461eaa1efa8f1d31c (diff) | |
| parent | d6ae6b017bb73b55bc6b22575031a3a8e7b75d41 (diff) | |
| download | mariadb-git-c20a4e6e026bdb4f5aed1402ea582ce4a2c5a393.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
include/my_global.h:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h index 99ca58cf47b..07fbfda229a 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -154,8 +154,6 @@ static SYMBOL symbols[] = { { "FULL", SYM(FULL),0,0}, { "FULLTEXT", SYM(FULLTEXT_SYM),0,0}, { "FUNCTION", SYM(UDF_SYM),0,0}, - { "GEMINI", SYM(GEMINI_SYM),0,0}, - { "GEMINI_SPIN_RETRIES", SYM(GEMINI_SPIN_RETRIES),0,0}, { "GLOBAL", SYM(GLOBAL_SYM),0,0}, { "GRANT", SYM(GRANT),0,0}, { "GRANTS", SYM(GRANTS),0,0}, |