bk commit into 5.1 tree (msvensson:1.2321)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2321 06/04/11 12:19:28 msvensson@shellback. +1 -0
  Merge 192.168.0.10:mysql/mysql-5.1
  into  shellback.:C:/mysql/my51-bug17368

  sql/ha_partition.cc
    1.44 06/04/11 12:19:18 msvensson@shellback. +0 -0
    Auto merged

# 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:	msvensson
# Host:	shellback.
# Root:	C:/mysql/my51-bug17368/RESYNC

--- 1.43/sql/ha_partition.cc	2006-04-10 17:35:05 +02:00
+++ 1.44/sql/ha_partition.cc	2006-04-11 12:19:18 +02:00
@@ -1135,7 +1135,6 @@
     partition_element *part_elem= part_it++;
     if (all_parts || part_elem->part_state == PART_CHANGED)
     {
-      handler *file;
       if (m_is_sub_partitioned)
       {
         List_iterator<partition_element> sub_it(part_elem->subpartitions);
@@ -2311,7 +2310,7 @@
 err_handler:
   while (file-- != m_file)
     (*file)->close();
-err:
+
   DBUG_RETURN(error);
 }
 
@@ -2915,7 +2914,6 @@
   int error;
   uint i= 0;
   uint32 part_id;
-  handler **file;
   DBUG_ENTER("ha_partition::rnd_init");
 
   include_partition_fields_in_used_fields();