Commit d39e8532 authored by unknown's avatar unknown

Backporting Kostja's changes made for 5.0 into 4.1.

Please use "ul" when merging this changeset to 5.0.


sql/item_timefunc.cc:
  Fix a valgrind warning in type_date test.
sql/sql_locale.cc:
  Fix a Windows build failure:  "false" -> FALSE
parent 60670458
...@@ -479,10 +479,11 @@ bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time, ...@@ -479,10 +479,11 @@ bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time,
const char *ptr, *end; const char *ptr, *end;
MY_LOCALE *locale; MY_LOCALE *locale;
THD *thd= current_thd; THD *thd= current_thd;
char buf[128]; char buf[128];
String tmp(buf, thd->variables.character_set_results); String tmp(buf, sizeof(buf), thd->variables.character_set_results);
uint errors= 0; uint errors= 0;
tmp.length(0);
str->length(0); str->length(0);
str->set_charset(&my_charset_bin); str->set_charset(&my_charset_bin);
locale = thd->variables.lc_time_names; locale = thd->variables.lc_time_names;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment