bk commit into 5.1 tree (reggie:1.2145) BUG#17720

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of . When  does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2145 06/03/06 23:18:48 reggie@big_geek. +1 -0
  Bug #17720
  Minor cleanup from Mikael's review
  

  sql/ha_partition.cc
    1.35 06/03/06 23:18:41 reggie@big_geek. +4 -8
    minor cleanup of code, returning inside the first if clause and then
    calling loop_extra if the if clause is not executed.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	reggie
# Host:	big_geek.
# Root:	C:/Work/mysql/mysql-5.1-bug17720

--- 1.34/sql/ha_partition.cc	2006-03-04 14:21:18 -06:00
+++ 1.35/sql/ha_partition.cc	2006-03-06 23:18:41 -06:00
@@ -4820,15 +4820,11 @@
         result= tmp;      
     for (file= m_reorged_file; *file; file++)
       if ((tmp= (*file)->extra(HA_EXTRA_PREPARE_FOR_DELETE)))
-        result= tmp;      
+        result= tmp;   
+    DBUG_RETURN(result);   
   }
-  else
-  {
-    for (file= m_file; *file; file++)
-      if ((tmp= (*file)->extra(HA_EXTRA_PREPARE_FOR_DELETE)))
-        result= tmp;      
-  }
-  DBUG_RETURN(result);
+  
+  DBUG_RETURN(loop_extra(HA_EXTRA_PREPARE_FOR_DELETE));
 }
 
 /*