revision-id: f79d9d454bc3fa6fecb34fec850752a688c0ccc7 (mariadb-10.0.28-17-gf79d9d4)
parent(s): e99990c631905cd923257331ef124a2bc9276e0d
author: Varun
committer: Varun
timestamp: 2016-12-06 19:48:58 +0530
message:

[MDEV]-11162 Assertion failing because cleanup does not get called

---
 mysql-test/t/bug-11162.test | 6 ++++++
 sql/sql_select.cc           | 1 +
 2 files changed, 7 insertions(+)

diff --git a/mysql-test/t/bug-11162.test b/mysql-test/t/bug-11162.test
new file mode 100644
index 0000000..5924851
--- /dev/null
+++ b/mysql-test/t/bug-11162.test
@@ -0,0 +1,6 @@
+--source include/have_innodb.inc
+
+CREATE TABLE t1 (i INT) ENGINE=InnoDB;
+SELECT ( SELECT DISTINCT GROUP_CONCAT(SLEEP(0)) FROM t1 GROUP BY i );
+SELECT i FROM t1 order by i LIMIT 1;
+drop table t1;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 2db9a2b..f345d3c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3144,6 +3144,7 @@ JOIN::destroy()
     */
     tmp_table_param.cleanup();
     tmp_join->tmp_table_param.copy_field= 0;
+    cleanup(1);
     DBUG_RETURN(tmp_join->destroy());
   }
   cond_equal= 0;
_______________________________________________
commits mailing list
commits@mariadb.org
https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits