From 3a2e1f87a1fa01bfe5ada183ec38412aa96726ce Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sun, 20 Jul 2025 12:06:42 +0200
Subject: [PATCH] MDEV-37268 ER_NOT_KEYFILE or assertion failure upon REPLACE
 into table with unique hash under READ-COMMITTED

followup for 9703c90712f3 (MDEV-37199 UNIQUE KEY USING HASH accepting duplicate records)

don't forget to rnd_init()/rnd_end() around rnd_pos()
---
 sql/handler.cc | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index 959fedae959..e58ddff3aa5 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -7774,16 +7774,19 @@ int handler::ha_write_row(const uchar *buf)
   {
     if (lookup_handler != this) // INSERT IGNORE or REPLACE or ODKU
     {
+      int olderror= error;
+      if ((error= rnd_init(0)))
+        goto err;
       position(buf);
-      int e= rnd_pos(lookup_buffer, ref);
-      if (!e)
-      {
-        increment_statistics(&SSV::ha_delete_count);
-        TABLE_IO_WAIT(tracker, PSI_TABLE_DELETE_ROW, MAX_KEY, e,
-          { e= delete_row(buf);})
-      }
-      if (e)
-        error= e;
+      if ((error= rnd_pos(lookup_buffer, ref)))
+        goto err;
+
+      increment_statistics(&SSV::ha_delete_count);
+      TABLE_IO_WAIT(tracker, PSI_TABLE_DELETE_ROW, MAX_KEY, error,
+                    { error= delete_row(buf);})
+      rnd_end();
+      if (!error)
+        error= olderror;
     }
     goto err;
   }