Skip to content

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

Backporting Kostja's changes made for 5.0 into 4.1. 

Please use "ul" when merging this changeset to 5.0.
parent 71b90cc7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 111 deletions
sql/item_timefunc.cc
View file @ 483d0e3b
...@@ -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;
......
sql/sql_locale.cc
View file @ 483d0e3b
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7