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

Auto-merge from mysql-trunk.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-02-05 15:02:03 +03:00
parent fce7472225 1a46ff873e
commit 44c3e5fc45
210 changed files with 6932 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_plugin.cc
View File

@@ -2092,7 +2092,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;
}