database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Temporary commit of 10.0-merge

Browse Source
This commit is contained in:
Michael Widenius
2013-03-26 00:03:13 +02:00
parent 35bc8f9f43
commit 068c61978e
649 changed files with 88289 additions and 22802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/thr_malloc.cc
View File

@ -134,7 +134,7 @@ char *sql_strmake_with_convert(const char *str, size_t arg_length,
if ((from_cs == &my_charset_bin) || (to_cs == &my_charset_bin))
{
// Safety if to_cs->mbmaxlen > 0
new_length= min(arg_length, max_res_length);
new_length= MY_MIN(arg_length, max_res_length);
memcpy(pos, str, new_length);
}
else