diff options
author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-08-03 15:30:31 +0500 |
---|---|---|
committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-08-03 15:30:31 +0500 |
commit | 0d1972aa72dd98a229a2a8c8faca46383bbcc572 (patch) | |
tree | c657f898b9581b0e2a19433212ad42eca9646b98 /sql/item_timefunc.cc | |
parent | 607ab14cf767ed0187e0c050ed61cb4ebaf34bb7 (diff) | |
parent | 53df09a9a6a99b82e2a8869eb16737a78772b29e (diff) | |
download | mariadb-git-0d1972aa72dd98a229a2a8c8faca46383bbcc572.tar.gz |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/conf_to_src.c:
Auto merged
strings/ctype-extra.c:
Auto merged
mysql-test/r/ctype_ucs.result:
After merge fix
mysql-test/t/ctype_ucs.test:
After merge fix
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r-- | sql/item_timefunc.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 873e2833a1e..ae18e4786d7 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1718,7 +1718,11 @@ void Item_func_date_format::fix_length_and_dec() Item *arg1= args[1]->this_item(); decimals=0; - collation.set(thd->variables.collation_connection); + CHARSET_INFO *cs= thd->variables.collation_connection; + uint32 repertoire= arg1->collation.repertoire; + if (!thd->variables.lc_time_names->is_ascii) + repertoire|= MY_REPERTOIRE_EXTENDED; + collation.set(cs, arg1->collation.derivation, repertoire); if (arg1->type() == STRING_ITEM) { // Optimize the normal case fixed_length=1; |