summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2021-08-18 13:31:32 +0300
committerAleksey Midenkov <midenok@gmail.com>2021-08-18 13:31:56 +0300
commitdc3a350df665b8e9bddc96365cec23a525f6b0b4 (patch)
tree139c1abe88297b680d702f23495106fffeba084c
parentcd65845a0eee830b8c783d2ebecae9d305e255c3 (diff)
downloadmariadb-git-dc3a350df665b8e9bddc96365cec23a525f6b0b4.tar.gz
MDEV-18734 ASAN additional fix for 10.3
Do swap_blobs() for new partition_read_multi_range mode.
-rw-r--r--sql/ha_partition.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index bae15892ba3..fc1f0ebcb4e 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -7956,6 +7956,11 @@ int ha_partition::handle_ordered_next(uchar *buf, bool is_next_same)
DBUG_PRINT("info", ("m_mrr_range_current->id: %u",
m_mrr_range_current->id));
memcpy(rec_buf, table->record[0], m_rec_length);
+ if (table->s->blob_fields)
+ {
+ Ordered_blob_storage **storage= *((Ordered_blob_storage ***) part_rec_buf_ptr);
+ swap_blobs(rec_buf, storage, false);
+ }
if (((PARTITION_KEY_MULTI_RANGE *) m_range_info[part_id])->id !=
m_mrr_range_current->id)
{