Merge 10.4 into 10.5

1 files changed, 1 insertions, 7 deletions

diff --git a/sql/handler.h b/sql/handler.h
index 6eaaf0f3256..1fd9a1c6fe0 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -3431,13 +3431,7 @@ public:
     start_bulk_insert(rows, flags);
     DBUG_VOID_RETURN;
   }
-  int ha_end_bulk_insert()
-  {
-    DBUG_ENTER("handler::ha_end_bulk_insert");
-    estimation_rows_to_insert= 0;
-    int ret= end_bulk_insert();
-    DBUG_RETURN(ret);
-  }
+  int ha_end_bulk_insert();
   int ha_bulk_update_row(const uchar *old_data, const uchar *new_data,
                          ha_rows *dup_key_found);
   int ha_delete_all_rows();