diff options
| author | unknown <antony@ltantony.mysql.com> | 2005-05-07 16:50:22 +0100 |
|---|---|---|
| committer | unknown <antony@ltantony.mysql.com> | 2005-05-07 16:50:22 +0100 |
| commit | 4989274681efb233f284d919c67836faa0b5905f (patch) | |
| tree | 412584e06dd49bb852f5da22c2313c5661c4530a /sql/sql_yacc.yy | |
| parent | 6d89aa730e6c9d507a0de2b1a0e088f174b89f22 (diff) | |
| parent | 0de8a53ff223bee81fa8bd17adecf2be8767fa26 (diff) | |
| download | mariadb-git-4989274681efb233f284d919c67836faa0b5905f.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/create.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/t/create.test:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8094d06c629..2231df3f4c1 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4458,8 +4458,6 @@ simple_expr: { $$= new Item_func_export_set($3, $5, $7, $9); } | EXPORT_SET '(' expr ',' expr ',' expr ',' expr ',' expr ')' { $$= new Item_func_export_set($3, $5, $7, $9, $11); } - | FALSE_SYM - { $$= new Item_int((char*) "FALSE",0,1); } | FORMAT_SYM '(' expr ',' NUM ')' { $$= new Item_func_format($3,atoi($5.str)); } | FROM_UNIXTIME '(' expr ')' @@ -4618,8 +4616,6 @@ simple_expr: { $$= new Item_func_trim($5,$3); } | TRUNCATE_SYM '(' expr ',' expr ')' { $$= new Item_func_round($3,$5,1); } - | TRUE_SYM - { $$= new Item_int((char*) "TRUE",1,1); } | ident '.' ident '(' udf_expr_list ')' { LEX *lex= Lex; @@ -6834,6 +6830,8 @@ literal: | NUM_literal { $$ = $1; } | NULL_SYM { $$ = new Item_null(); Lex->next_state=MY_LEX_OPERATOR_OR_IDENT;} + | FALSE_SYM { $$= new Item_int((char*) "FALSE",0,1); } + | TRUE_SYM { $$= new Item_int((char*) "TRUE",1,1); } | HEX_NUM { $$ = new Item_hex_string($1.str, $1.length);} | BIN_NUM { $$= new Item_bin_string($1.str, $1.length); } | UNDERSCORE_CHARSET HEX_NUM |