database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-01-05 22:52:06 +02:00
parent 6feb74c4b2 6d49ef49e5
commit fa7d85bb87
73 changed files with 2051 additions and 5588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_repl.cc
View File

@ -3414,7 +3414,8 @@ static bool get_string_parameter(char *to, const char *from, size_t length,
uint from_numchars= cs->cset->numchars(cs, from, from + from_length);
if (from_numchars > length / cs->mbmaxlen)
{
my_error(ER_WRONG_STRING_LENGTH, MYF(0), from, name, (int) (length / cs->mbmaxlen));
my_error(ER_WRONG_STRING_LENGTH, MYF(0), from, name,
(int) (length / cs->mbmaxlen));
return 1;
}
memcpy(to, from, from_length+1);