diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
| commit | 4bf849c23c2fe2174016da630705a362f76d3922 (patch) | |
| tree | f39b89f218ff81ceb62349eb225a455d52c3ba78 /sql/sql_plugin.cc | |
| parent | f04cf03f75ffca0b99562c027c1c57340d375f66 (diff) | |
| parent | 62db6839b82d824567979ef3e05caccd67ed11ec (diff) | |
| download | mariadb-git-4bf849c23c2fe2174016da630705a362f76d3922.tar.gz | |
Merge MySQL 5.1.44 into MariaDB.
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 56d181bdda2..7e017588531 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -2085,7 +2085,7 @@ static int check_func_set(THD *thd, struct st_mysql_sys_var *var, &error, &error_len, ¬_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; } |