summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2010-01-19 14:48:41 +0200
committerGeorgi Kodinov <joro@sun.com>2010-01-19 14:48:41 +0200
commitf79e182a9c15b2b26d3bd49af9d688b22fe4cb5a (patch)
tree392047c6a34b03ea06f7909218c81988283ed4ea /sql
parentc26551e15dfba78c3a5111c4c2016202c460a9b4 (diff)
downloadmariadb-git-f79e182a9c15b2b26d3bd49af9d688b22fe4cb5a.tar.gz
revert of the fix for bug #45989: pushed by mistake.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc2
1 files changed, 0 insertions, 2 deletions
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;