diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-18 10:51:10 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-18 10:51:10 +0200 |
| commit | b088967252dd925f6aa6c9270744374f80fb47e8 (patch) | |
| tree | 8717318dd6e068daea01d3cbcb85aeba8f2f25ab /sql | |
| parent | 62a7e160bc0e960ec1374a546dde4a7f26120ceb (diff) | |
| parent | cd9d89a75d4cd5e9408cd34e6229910acf23cdc1 (diff) | |
| download | mariadb-git-b088967252dd925f6aa6c9270744374f80fb47e8.tar.gz | |
Merge sin.intern.azundris.com:/misc/mysql/31588/41-31588
into sin.intern.azundris.com:/misc/mysql/31588/50-31588
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
SCCS merged
mysql-test/t/variables.test:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index fbfe174434d..f848703e525 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1752,7 +1752,7 @@ bool sys_var::check_set(THD *thd, set_var *var, TYPELIB *enum_names) ¬_used)); if (error_len) { - strmake(buff, error, min(sizeof(buff), error_len)); + strmake(buff, error, min(sizeof(buff) - 1, error_len)); goto err; } } |