diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-06-22 19:28:01 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-06-22 19:28:01 +0400 |
| commit | c65bf20be8c9cca1aa7f0d21bcea657926daef03 (patch) | |
| tree | e56d1a2b99d96398ce9c551e5721804f263b6cc6 /sql/sql_yacc.yy | |
| parent | d82af3ae763340a7be60c1423d5aca3df8af1aa5 (diff) | |
| parent | 4c670550d266d66a7ab0f0883b6e3994346872dc (diff) | |
| download | mariadb-git-c65bf20be8c9cca1aa7f0d21bcea657926daef03.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index e1a4eb1c1a5..49ef2f29dfc 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -606,7 +606,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %type <simple_string> remember_name remember_end opt_ident opt_db text_or_password - opt_escape opt_constraint constraint + opt_constraint constraint %type <string> text_string opt_gconcat_separator @@ -634,7 +634,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); using_list expr_or_default set_expr_or_default interval_expr param_marker singlerow_subselect singlerow_subselect_init exists_subselect exists_subselect_init geometry_function - signed_literal now_or_signed_literal + signed_literal now_or_signed_literal opt_escape %type <item_num> NUM_literal @@ -3576,8 +3576,12 @@ having_clause: ; opt_escape: - ESCAPE_SYM TEXT_STRING_literal { $$= $2.str; } - | /* empty */ { $$= (char*) "\\"; }; + ESCAPE_SYM simple_expr { $$= $2; } + | /* empty */ + { + $$= new Item_string("\\", 1, &my_charset_latin1); + } + ; /* |