diff options
| author | bar@gw.udmsearch.izhnet.ru <> | 2002-05-31 21:04:47 +0500 |
|---|---|---|
| committer | bar@gw.udmsearch.izhnet.ru <> | 2002-05-31 21:04:47 +0500 |
| commit | 24f28f3bf0eb6e434f7c377cf2ec31210e944e77 (patch) | |
| tree | 64e2c9c3d1a2af5b08f4c1eb3ea4f56b7cb02bb8 /sql/sql_yacc.yy | |
| parent | 06432f9ee3c56d079fd598505dbf88cb376f765c (diff) | |
| download | mariadb-git-24f28f3bf0eb6e434f7c377cf2ec31210e944e77.tar.gz | |
Added filling of unicode mapping arrays during charset.conf loading
All charset.conf files were extended to supply unicode mapping array
CONVERT() now uses more common order of arguments: CONVERT(expr,charset_from,charset_to)
Dynamic charset can be used as CONVERT() argument
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 756afbd7a09..61d97cb43f2 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1718,7 +1718,7 @@ simple_expr: | CONVERT_SYM '(' expr ',' cast_type ')' { $$= create_func_cast($3, $5); } | CONVERT_SYM '(' expr USING IDENT ')' { - CHARSET_INFO *cs=find_compiled_charset_by_name($5.str); + CHARSET_INFO *cs=get_charset_by_name($5.str,MYF(MY_WME)); if (!cs) { net_printf(¤t_thd->net,ER_UNKNOWN_CHARACTER_SET,$5); @@ -1728,7 +1728,7 @@ simple_expr: } | CONVERT_SYM '(' expr ',' expr ',' expr ')' { - $$= new Item_func_conv_charset3($3,$5,$7); + $$= new Item_func_conv_charset3($3,$7,$5); } | FUNC_ARG0 '(' ')' { $$= ((Item*(*)(void))($1.symbol->create_func))();} |