summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authorAditya A <aditya.a@oracle.com>2014-07-01 16:52:35 +0530
committerSergey Vojtovich <svoj@mariadb.org>2015-10-28 12:09:55 +0400
commite1ed331ceabbf51b3409529ec78039c42324e1b0 (patch)
tree053ad3c4fc665cd79fb915d717f26abf9bf6c929 /sql/ha_partition.cc
parent4834d822efe5a812d251f254387b3f80beb9380d (diff)
downloadmariadb-git-e1ed331ceabbf51b3409529ec78039c42324e1b0.tar.gz
MDEV-8805 - Assertion `!m_ordered_rec_buffer' failed in
ha_partition::init_record_priority_queue() Cherry-pick rev.6b0ee0c795499cee7f9deb649fb010801e0be4c2 from mysql-5.6. Bug #18305270 BACKPORT BUG#18694052 FIX FOR ASSERTION `!M_ORDERED_REC_BUFFER' FAILED TO 5.6 PROBLEM ------- Missed to remove record priority queue if init_index failed for a partition which was causing the crash. FIX --- Remove priority queue if init_index fails for partition.
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index d8fc647d2a2..e59954e13c2 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -5271,6 +5271,7 @@ err:
{
(void) m_file[j]->ha_index_end();
}
+ destroy_record_priority_queue();
}
DBUG_RETURN(error);
}