diff options
author | Alexander Barkov <bar@mariadb.org> | 2016-12-05 16:50:12 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2016-12-06 06:54:52 +0400 |
commit | 46dee0d1848e24e39fc236e78a438efa22356f8d (patch) | |
tree | b3e1d20d0c889514330682ec36225bfbc7a13db1 /sql | |
parent | 18cdff6765b954431934f6e6d0b1e281c8f0e0b8 (diff) | |
download | mariadb-git-46dee0d1848e24e39fc236e78a438efa22356f8d.tar.gz |
MDEV-10717 Assertion `!null_value' failed in virtual bool Item::send(Protocol*, String*)
The problem was that null_value was not set to "false" on a well-formed row.
If an ill-formed row was followed by a well-forned row, null_value remained
"true" in the call of Item::send() for the well-formed row.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index 3448b236640..ede1df6aa9b 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5743,6 +5743,7 @@ String *Item::check_well_formed_result(String *str, bool send_error) uint wlen= cs->cset->well_formed_len(cs, str->ptr(), str->ptr() + str->length(), str->length(), &well_formed_error); + null_value= false; if (wlen < str->length()) { THD *thd= current_thd; |