summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-26 09:43:02 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-26 09:43:02 +0100
commita91c59c2affdebb4b34c2c8000b0b1648d43046d (patch)
tree052f54f48ddd4f177416213eda03f1a55e65dc70 /sql/item_strfunc.cc
parent319bcde937fa449d55a1b58ede05a8a50960c0ec (diff)
downloadmariadb-git-a91c59c2affdebb4b34c2c8000b0b1648d43046d.tar.gz
MDEV-5920 MySQL Bug#16765410 FTS: STACK AROUND THE VARIABLE 'MYSTR' WAS CORRUPTED IN INNOBASE_STRNXFRM
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index d10ed61d28a..309a191dda8 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -3554,6 +3554,8 @@ String *Item_func_weight_string::val_str(String *str)
nweights ? nweights : tmp_length,
(const uchar *) res->ptr(), res->length(),
flags);
+ DBUG_ASSERT(frm_length <= tmp_length);
+
tmp_value.length(frm_length);
null_value= 0;
return &tmp_value;