Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.r18.ru:/usr/home/ram/work/4.1

mysql-test/r/handler.result

@@ -148,3 +148,22 @@ alter table t1 type=MyISAM;
 handler t2 read first;
 ERROR 42S02: Unknown table 't2' in HANDLER
 drop table t1;
+create table t1 (a int);
+insert into t1 values (1),(2),(3),(4),(5),(6);
+delete from t1 limit 2;
+handler t1 open;
+handler t1 read first;
+a
+3
+handler t1 read first limit 1,1;
+a
+4
+handler t1 read first limit 2,2;
+a
+5
+6
+delete from t1 limit 3;
+handler t1 read first;
+a
+6
+drop table t1;

mysql-test/t/handler.test

@@ -85,3 +85,17 @@ alter table t1 type=MyISAM;
 handler t2 read first;
 drop table t1;
 
+#
+# test case for the bug #787
+#
+
+create table t1 (a int);
+insert into t1 values (1),(2),(3),(4),(5),(6);
+delete from t1 limit 2;
+handler t1 open;
+handler t1 read first;
+handler t1 read first limit 1,1;
+handler t1 read first limit 2,2;
+delete from t1 limit 3;
+handler t1 read first;
+drop table t1;

sql/sql_handler.cc

@@ -222,6 +222,8 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
       goto err;
     }
 
+    if (err == HA_ERR_RECORD_DELETED)
+      continue;
     if (err)
     {
       if (err != HA_ERR_KEY_NOT_FOUND && err != HA_ERR_END_OF_FILE)
@@ -233,31 +235,24 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
       }
       goto ok;
     }
-    if (cond)
+    if (cond && !cond->val_int())
+      continue;
+    if (!err && num_rows >= offset_limit)
     {
-      err=err;
-      if (!cond->val_int())
-        continue;
-    }
-    if (num_rows >= offset_limit)
-    {
-      if (!err)
+      String *packet = &thd->packet;
+      Item *item;
+      protocol->prepare_for_resend();
+      it.rewind();
+      while ((item=it++))
       {
-        String *packet = &thd->packet;
-        Item *item;
-        protocol->prepare_for_resend();
-        it.rewind();
-        while ((item=it++))
-        {
-          if (item->send(thd->protocol, &buffer))
-          {
-            protocol->free();                             // Free used
-            my_error(ER_OUT_OF_RESOURCES,MYF(0));
-            goto err;
-          }
-        }
-	protocol->write();
+	if (item->send(thd->protocol, &buffer))
+	{
+	  protocol->free();                             // Free used
+	  my_error(ER_OUT_OF_RESOURCES,MYF(0));
+	  goto err;
+	}
       }
+      protocol->write();
     }
     num_rows++;
   }