bk commit into 6.0-falcon tree (svoj:1.2582) BUG#28026

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of svoj. When svoj 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@stripped, 2007-06-20 12:58:43+05:00, svoj@stripped +1 -0
  BUG#28026 - Falcon: crash if partitions and select for update
  
  Assertion failure may happen with falcon + partition + select for
  update.
  
  Though assertion failure is fixed with this patch, falcon still
  deadlocks when running falcon_bug_28026.test.

  sql/ha_partition.cc@stripped, 2007-06-20 12:58:41+05:00, svoj@stripped +2 -1
    In case rnd_next fails, we must call ha_rnd_end. This is done
    conditionally (NO_CURRENT_PART_ID != m_part_spec.start_part)
    in ha_partition::ha_rnd_end. Thus we may not reset
    m_part_spec.start_part in case rnd is not ended.

# 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:	svoj
# Host:	june.mysql.com
# Root:	/home/svoj/devel/mysql/BUG28026/mysql-5.1-falcon

--- 1.87/sql/ha_partition.cc	2007-06-05 12:45:58 +05:00
+++ 1.88/sql/ha_partition.cc	2007-06-20 12:58:41 +05:00
@@ -3117,7 +3117,7 @@ int ha_partition::rnd_next(uchar *buf)
       continue;                               // Probably MyISAM
 
     if (result != HA_ERR_END_OF_FILE)
-      break;                                  // Return error
+      goto end_dont_reset_start_part;         // Return error
 
     /* End current partition */
     late_extra_no_cache(part_id);
@@ -3143,6 +3143,7 @@ int ha_partition::rnd_next(uchar *buf)
 
 end:
   m_part_spec.start_part= NO_CURRENT_PART_ID;
+end_dont_reset_start_part:
   table->status= STATUS_NOT_FOUND;
   DBUG_RETURN(result);
 }