diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-08-12 18:53:33 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-08-12 18:53:33 +0200 |
| commit | 89260b24c9334fb7357ed5fdac62e24c278cda3d (patch) | |
| tree | 7f33b387933c4cb3db8fbf8ba8e901f7dc27c68d /sql/sql_yacc.yy | |
| parent | abc73040b51372ad8390604da6b88a76c6bcd1fb (diff) | |
| parent | b28f09bd8cf65a0ce7dbe8fb04033cdf7f9323ff (diff) | |
| download | mariadb-git-89260b24c9334fb7357ed5fdac62e24c278cda3d.tar.gz | |
merge
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index cf791890311..4ed9946a334 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -494,7 +494,6 @@ Item* handle_sql2003_note184_exception(THD *thd, Item* left, bool equal, enum enum_tx_isolation tx_isolation; enum Cast_target cast_type; enum Item_udftype udf_type; - enum ha_choice choice; CHARSET_INFO *charset; thr_lock_type lock_type; interval_type interval, interval_time_st; @@ -1164,8 +1163,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %type <ulonglong_number> ulonglong_num real_ulonglong_num size_number -%type <choice> choice - %type <p_elem_value> part_bit_expr @@ -9066,11 +9063,6 @@ dec_num: | FLOAT_NUM ; -choice: - ulong_num { $$= $1 != 0 ? HA_CHOICE_YES : HA_CHOICE_NO; } - | DEFAULT { $$= HA_CHOICE_UNDEF; } - ; - procedure_clause: /* empty */ | PROCEDURE ident /* Procedure name */ |