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/sql_yacc.yy | |
| 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/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8960f391f26..5dae9eeb3cb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -186,8 +186,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token FROM %token FULL %token FULLTEXT_SYM -%token GEMINI_SYM -%token GEMINI_SPIN_RETRIES %token GLOBAL_SYM %token GRANT %token GRANTS @@ -813,7 +811,6 @@ table_types: | HEAP_SYM { $$= DB_TYPE_HEAP; } | BERKELEY_DB_SYM { $$= DB_TYPE_BERKELEY_DB; } | INNOBASE_SYM { $$= DB_TYPE_INNODB; } - | GEMINI_SYM { $$= DB_TYPE_GEMINI; } row_types: DEFAULT { $$= ROW_TYPE_DEFAULT; } @@ -2868,7 +2865,6 @@ keyword: | FIXED_SYM {} | FLUSH_SYM {} | GRANTS {} - | GEMINI_SYM {} | GLOBAL_SYM {} | HEAP_SYM {} | HANDLER_SYM {} @@ -2963,7 +2959,6 @@ set: lex->sql_command= SQLCOM_SET_OPTION; lex->select->options=lex->thd->options; lex->select->select_limit=lex->thd->default_select_limit; - lex->gemini_spin_retries=lex->thd->gemini_spin_retries; lex->tx_isolation=lex->thd->tx_isolation; lex->option_type=0; lex->option_list.empty() @@ -3032,14 +3027,6 @@ option_value: { current_thd->next_insert_id=$3; } - | GEMINI_SPIN_RETRIES equal ULONG_NUM - { - Lex->gemini_spin_retries= $3; - } - | GEMINI_SPIN_RETRIES equal DEFAULT - { - Lex->gemini_spin_retries= 1; - } | CHAR_SYM SET IDENT { CONVERT *tmp; |