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

Automerge MySQL 5.1.44 merge into MariaDB trunk.

This commit is contained in:
unknown
2010-03-09 20:23:30 +01:00
306 changed files with 10453 additions and 2283 deletions

View File

@ -2100,7 +2100,7 @@ static int check_func_set(THD *thd, struct st_mysql_sys_var *var,
&error, &error_len, &not_used);
if (error_len)
{
strmake(buff, error, min(sizeof(buff), error_len));
strmake(buff, error, min(sizeof(buff) - 1, error_len));
strvalue= buff;
goto err;
}