bk commit into 5.1 tree (mattiasj:1.2576) BUG#34604

[mattiasj]

Below is the list of changes that have just been committed into a local
5.1 repository of mattiasj.  When mattiasj 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, 2008-04-09 14:48:42+02:00, mattiasj@witty. +1 -0
  Bug#34604: hander::ha_rnd_end(): Assertion inited==RND failed
  
  In some cases error was not properly propagated through
  ha_partition::rnd_next.
  
  Will now return the error code from the partitions rnd_next and
  update m_part_spec.start_part and m_last_part properly.
  This makes the inited state to be correct.

  sql/ha_partition.cc@stripped, 2008-04-09 14:48:39+02:00, mattiasj@witty. +3 -2
    Bug#34604: hander::ha_rnd_end(): Assertion inited==RND failed
    
    In some cases error was not properly propagated through
    ha_partition::rnd_next.
    
    Will now return the error code from the partitions rnd_next and
    update m_part_spec.start_part and m_last_part properly.

diff -Nrup a/sql/ha_partition.cc b/sql/ha_partition.cc
--- a/sql/ha_partition.cc	2008-03-17 15:56:51 +01:00
+++ b/sql/ha_partition.cc	2008-04-09 14:48:39 +02:00
@@ -3251,11 +3251,10 @@ int ha_partition::rnd_next(uchar *buf)
   
   while (TRUE)
   {
-    int result= file->rnd_next(buf);
+    result= file->rnd_next(buf);
     if (!result)
     {
       m_last_part= part_id;
-      m_part_spec.start_part= part_id;
       table->status= 0;
       DBUG_RETURN(0);
     }
@@ -3284,6 +3283,8 @@ int ha_partition::rnd_next(uchar *buf)
       result= HA_ERR_END_OF_FILE;
       break;
     }
+    m_last_part= part_id;
+    m_part_spec.start_part= part_id;
     file= m_file[part_id];
     DBUG_PRINT("info", ("rnd_init on partition %d", part_id));
     if ((result= file->ha_rnd_init(1)))