Revert "Fixes a problem with heap when scanning and insert rows at th…

…e same time" This reverts commit 262927a.
MariaDB · Aug 20, 2019 · 1ad70bf · 1ad70bf
1 parent 4438ff0
commit 1ad70bf
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/storage/heap/hp_scan.c b/storage/heap/hp_scan.c
@@ -44,19 +44,22 @@ int heap_scan(register HP_INFO *info, uchar *record)
   DBUG_ENTER("heap_scan");
 
   pos= ++info->current_record;
-  if (pos >= share->records+share->deleted)
-  {
-    info->update= 0;                        /* No active row */
-    DBUG_RETURN(my_errno= HA_ERR_END_OF_FILE);
-  }
-
   if (pos < info->next_block)
   {
     info->current_ptr+=share->block.recbuffer;
   }
   else
   {
     info->next_block+=share->block.records_in_block;
+    if (info->next_block >= share->records+share->deleted)
+    {
+      info->next_block= share->records+share->deleted;
+      if (pos >= info->next_block)
+      {
+	info->update= 0;
+	DBUG_RETURN(my_errno= HA_ERR_END_OF_FILE);
+      }
+    }
     hp_find_record(info, pos);
   }
   if (!info->current_ptr[share->visible])