From: Jorgen Loland
Date: April 6 2011 1:36pm
Subject: bzr commit into mysql-trunk branch (jorgen.loland:3333) Bug#11882131
List-Archive: http://lists.mysql.com/commits/134819
X-Bug: 11882131
Message-Id: <20110406133636.0A56D79F@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6013126581248541294=="

--===============6013126581248541294==
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:georgi.kodinov@stripped

 3333 Jorgen Loland	2011-04-06
      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-06 13:36:32 +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-06 13:36:32 +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-04 08:47:25 +0000
+++ b/sql/sql_select.cc	2011-04-06 13:36:32 +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-06 13:36:32 +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=0;
       }
       else
       {


--===============6013126581248541294==
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\
#   7fnnpffk5jv9f26r
# target_branch: file:///export/home/jl208045/mysql/mysql-trunk-\
#   11882131/
# testament_sha1: d9d6c268286a691795a79253e26ae6276cf048d5
# timestamp: 2011-04-06 15:36:35 +0200
# base_revision_id: georgi.kodinov@stripped\
#   i1cl5q3znfn0jj9e
# 
# Begin bundle
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
C5Tl15qO0/+LuSKcKEg9+/67gA==


--===============6013126581248541294==--