From: Jorgen Loland
Date: April 7 2011 2:24pm
Subject: bzr commit into mysql-trunk branch (jorgen.loland:3340) Bug#11882131
List-Archive: http://lists.mysql.com/commits/134952
X-Bug: 11882131
Message-Id: <20110407142451.058FC3A7@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3536709602591885471=="

--===============3536709602591885471==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/jl208045/mysql/mysql-trunk-11882131/ based on revid:bjorn.munch@stripped

 3340 Jorgen Loland	2011-04-07
      BUG#11882131 Post-commit cleanup: Replace 
        delete select->quick; select->quick=X;
      with existing utility-function SQL_SELECT::set_quick().

    modified:
      sql/opt_range.cc
      sql/sql_join_cache.cc
      sql/sql_select.cc
      sql/sql_update.cc
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2011-04-04 08:47:25 +0000
+++ b/sql/opt_range.cc	2011-04-07 14:24:47 +0000
@@ -1154,8 +1154,7 @@ SQL_SELECT::SQL_SELECT() :quick(0),cond(
 
 void SQL_SELECT::cleanup()
 {
-  delete quick;
-  quick= 0;
+  set_quick(NULL);
   if (free_cond)
   {
     free_cond=0;
@@ -2216,8 +2215,7 @@ int SQL_SELECT::test_quick_select(THD *t
 		      (ulong) keys_to_use.to_ulonglong(), (ulong) prev_tables,
 		      (ulong) const_tables));
   DBUG_PRINT("info", ("records: %lu", (ulong) head->file->stats.records));
-  delete quick;
-  quick=0;
+  set_quick(NULL);
   needed_reg.clear_all();
   quick_keys.clear_all();
   if (keys_to_use.is_clear_all())
@@ -2458,10 +2456,7 @@ int SQL_SELECT::test_quick_select(THD *t
     {
       records= best_trp->records;
       if (!(quick= best_trp->make_quick(&param, TRUE)) || quick->init())
-      {
-        delete quick;
-        quick= NULL;
-      }
+        set_quick(NULL);
     }
 
   free_mem:

=== modified file 'sql/sql_join_cache.cc'
--- a/sql/sql_join_cache.cc	2011-03-22 11:44:40 +0000
+++ b/sql/sql_join_cache.cc	2011-04-07 14:24:47 +0000
@@ -1777,12 +1777,9 @@ enum_nested_loop_state JOIN_CACHE_BNL::j
   if (skip_last)     
     put_record();     
  
-  if (join_tab->use_quick == 2 && join_tab->select->quick)
-  { 
+  if (join_tab->use_quick == QS_DYNAMIC_RANGE && join_tab->select->quick)
     /* A dynamic range access was used last. Clean up after it */
-    delete join_tab->select->quick;
-    join_tab->select->quick= 0;
-  }
+    join_tab->select->set_quick(NULL);
 
   for (tab= join->join_tab; tab != join_tab ; tab++)
   {

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-04-07 10:45:24 +0000
+++ b/sql/sql_select.cc	2011-04-07 14:24:47 +0000
@@ -11253,10 +11253,7 @@ make_join_readinfo(JOIN *join, ulonglong
     case JT_REF_OR_NULL:
     case JT_REF:
       if (tab->select)
-      {
-	delete tab->select->quick;
-	tab->select->quick=0;
-      }
+        tab->select->set_quick(NULL);
       delete tab->quick;
       tab->quick=0;
       /* fall through */
@@ -18421,8 +18418,7 @@ int read_first_record_seq(JOIN_TAB *tab)
 static int
 test_if_quick_select(JOIN_TAB *tab)
 {
-  delete tab->select->quick;
-  tab->select->quick=0;
+  tab->select->set_quick(NULL);
   return tab->select->test_quick_select(tab->join->thd, 
                                         tab->keys,
                                         0,          // empty table map
@@ -20341,10 +20337,8 @@ skipped_filesort:
 use_filesort:
   // Restore original save_quick
   if (select && select->quick != save_quick)
-  {
-    delete select->quick;
-    select->quick= save_quick;
-  }
+    select->set_quick(save_quick);
+
   if (orig_select_cond_saved)
     tab->set_cond(orig_select_cond, __LINE__);
   DBUG_RETURN(0);

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2011-04-01 14:04:52 +0000
+++ b/sql/sql_update.cc	2011-04-07 14:24:47 +0000
@@ -577,11 +577,10 @@ int mysql_update(THD *thd,
       /* Change select to use tempfile */
       if (select)
       {
-	delete select->quick;
-	if (select->free_cond)
-	  delete select->cond;
-	select->quick=0;
-	select->cond=0;
+        select->set_quick(NULL);
+        if (select->free_cond)
+          delete select->cond;
+        select->cond= NULL;
       }
       else
       {


--===============3536709602591885471==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jorgen.loland@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@stripped\
#   uqf1btsg4ezb9gwu
# target_branch: file:///export/home/jl208045/mysql/mysql-trunk-\
#   11882131/
# testament_sha1: bdeff4112354d99e31862084ee017b76793c769e
# timestamp: 2011-04-07 16:24:50 +0200
# base_revision_id: bjorn.munch@stripped\
#   1zo05n4brg2qseg5
# 
# Begin bundle
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


--===============3536709602591885471==--