From e1ed331ceabbf51b3409529ec78039c42324e1b0 Mon Sep 17 00:00:00 2001
From: Aditya A <aditya.a@oracle.com>
Date: Tue, 1 Jul 2014 16:52:35 +0530
Subject: 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.
---
 sql/ha_partition.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sql/ha_partition.cc')

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);
 }
-- 
cgit v1.2.1