diff options
| author | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2007-02-28 22:30:40 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2007-02-28 22:30:40 +0100 |
| commit | d5e983aafcd0dab59f8760bd76c6d350c22290ea (patch) | |
| tree | 61efd2550a84baf4c5f283498e5a2611667a4d7c /sql/sql_yacc.yy | |
| parent | 3a520a785eeee973e79d1f6e482e270e24a20c56 (diff) | |
| parent | a2b4f52912491e1887fa25bab674cb71f5db6dc9 (diff) | |
| download | mariadb-git-d5e983aafcd0dab59f8760bd76c6d350c22290ea.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
sql/mysql_priv.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 6becb6cc3a3..004e35c8993 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -992,6 +992,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); old_or_new_charset_name_or_default collation_name collation_name_or_default + opt_load_data_charset %type <variable> internal_variable_name @@ -3262,6 +3263,10 @@ charset_name_or_default: charset_name { $$=$1; } | DEFAULT { $$=NULL; } ; +opt_load_data_charset: + /* Empty */ { $$= NULL; } + | charset charset_name_or_default { $$= $2; } + ; old_or_new_charset_name: ident_or_text @@ -7242,6 +7247,8 @@ load_data: lex->update_list.empty(); lex->value_list.empty(); } + opt_load_data_charset + { Lex->exchange->cs= $12; } opt_field_term opt_line_term opt_ignore_lines opt_field_or_var_spec opt_load_data_set_spec {} |