From 2fa49930cab5e070b5abaadbc2ab2b0899bc41b5 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Tue, 19 Jan 2010 14:48:41 +0200
Subject: [PATCH] revert of the fix for bug #45989: pushed by mistake.

---
 mysql-test/r/subselect.result | 12 ------------
 mysql-test/t/subselect.test   | 17 -----------------
 sql/sql_select.cc             |  2 --
 3 files changed, 31 deletions(-)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 99d1f18b010..f446d8feec3 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -4602,16 +4602,4 @@ SELECT 1 FROM t1 GROUP BY
 1
 1
 DROP TABLE t1;
-#
-# Bug #45989 take 2 : memory leak after explain encounters an 
-# error in the query
-#
-CREATE TABLE t1(a LONGTEXT);
-INSERT INTO t1 VALUES (repeat('a',@@global.max_allowed_packet));
-INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
-EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
-(SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
-WHERE t1.a = d1.a;
-ERROR 42S22: Unknown column 'd1.a' in 'where clause'
-DROP TABLE t1;
 End of 5.1 tests.
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index eca86de1e82..a4314c45cba 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -3585,21 +3585,4 @@ SELECT 1 FROM t1 GROUP BY
   (SELECT LAST_INSERT_ID() FROM t1 ORDER BY MIN(a) ASC LIMIT 1);
 DROP TABLE t1;
 
---echo #
---echo # Bug #45989 take 2 : memory leak after explain encounters an 
---echo # error in the query
---echo #
-
-CREATE TABLE t1(a LONGTEXT);
-INSERT INTO t1 VALUES (repeat('a',@@global.max_allowed_packet));
-INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
-
---error ER_BAD_FIELD_ERROR
-EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
-(SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
-WHERE t1.a = d1.a;
-
-DROP TABLE t1;
-
-
 --echo End of 5.1 tests.
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 24876ffec14..644f0072b7b 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5824,8 +5824,6 @@ JOIN::make_simple_join(JOIN *parent, TABLE *tmp_table)
   const_table_map= 0;
   tmp_table_param.field_count= tmp_table_param.sum_func_count=
     tmp_table_param.func_count= 0;
-  if (tmp_table_param.copy_field)
-    delete [] tmp_table_param.copy_field;
   tmp_table_param.copy_field= tmp_table_param.copy_field_end=0;
   first_record= sort_and_group=0;
   send_records= (ha_rows) 0;