Commit 483d0e3b authored by bar@mysql.com/bar.intranet.mysql.r18.ru's avatar bar@mysql.com/bar.intranet.mysql.r18.ru
Browse files

Backporting Kostja's changes made for 5.0 into 4.1. 

Please use "ul" when merging this changeset to 5.0.
parent 71b90cc7

sql/item_timefunc.cc

+3 −2
Original line number Diff line number Diff line
@@ -480,9 +480,10 @@ bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time, 
  MY_LOCALE *locale;

  THD *thd= current_thd;

  char buf[128];

  String tmp(buf, thd->variables.character_set_results);

  String tmp(buf, sizeof(buf), thd->variables.character_set_results);

  uint errors= 0;



  tmp.length(0);

  str->length(0);

  str->set_charset(&my_charset_bin);

  locale = thd->variables.lc_time_names;

sql/sql_locale.cc

+109 −109

File changed.

Preview size limit exceeded, changes collapsed.