diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-06-09 12:08:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-06-09 12:08:46 +0400 |
| commit | f744b2a15ff3a8e2b93ae4f17ffe5a22af9bcd88 (patch) | |
| tree | 3df42a4118b4b1660637228aa725e60fb3dd49c5 /sql | |
| parent | 93fc04ff1dc613a9ad75ccc57988a6b57b94b6cb (diff) | |
| download | mariadb-git-f744b2a15ff3a8e2b93ae4f17ffe5a22af9bcd88.tar.gz | |
MDEV-8283 crash in get_mm_leaf with xor on binary col
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 190cd450240..d8aeca349ec 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -8370,8 +8370,8 @@ get_mm_leaf(RANGE_OPT_PARAM *param, COND *conf_func, Field *field, value->result_type() == STRING_RESULT && key_part->image_type == Field::itRAW && field->charset() != conf_func->compare_collation() && - !(conf_func->compare_collation()->state & MY_CS_BINSORT && - (type == Item_func::EQUAL_FUNC || type == Item_func::EQ_FUNC))) + !((type == Item_func::EQUAL_FUNC || type == Item_func::EQ_FUNC) && + conf_func->compare_collation()->state & MY_CS_BINSORT)) goto end; if (value->cmp_type() == TIME_RESULT && field->cmp_type() != TIME_RESULT) goto end; |