remove thd_mark_as_hard_kill()

(because it's conceptually wrong. only the user can decide whether the kill is
allowed to leave tables in the inconsistent state, storage engine has no say in that)

3 files changed, 0 insertions, 24 deletions

diff --git a/sql/handler.h b/sql/handler.h
index e5da92b0d40..af5d7e6d606 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -868,7 +868,6 @@ struct handlerton
      Tell handler that query has been killed.
      hard_kill is set in case of HARD KILL (abort query even if
      it may corrupt table).
-     Return 1 if the handler wants to upgrade the kill to a hard kill
    */
    void (*kill_query)(handlerton *hton, THD *thd, my_bool hard_kill);
    /*
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 312de8c74e4..616e827a552 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3853,18 +3853,6 @@ extern "C" int thd_killed(const MYSQL_THD thd)
   return thd->killed;
 }
 
-/**
-  Change kill level to hard.
-  This ensures that thd_killed() will return true.
-  This is important for storage engines that uses thd_killed() to
-  verify if thread is killed.
-*/
-
-extern "C" void thd_mark_as_hard_kill(MYSQL_THD thd)
-{
-  thd->mark_as_hard_kill();
-}
-
 
 /**
    Send an out-of-band progress report to the client
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 2561effb478..f1b3652c15c 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2729,17 +2729,6 @@ public:
             (!transaction.stmt.modified_non_trans_table ||
              (variables.sql_mode & MODE_STRICT_ALL_TABLES)));
   }
-  /*
-    Increase level of kill ; Ensures that thd_killed() returns true.
-
-    Needed if storage engine wants to abort things because of a 'soft' (ie,
-    safe) kill but still uses thd_killed() to check if it's killed.
-  */
-  inline void mark_as_hard_kill()
-  {
-    DBUG_ASSERT(killed != NOT_KILLED);
-    killed= (killed_state) (killed | KILL_HARD_BIT);
-  }
   void set_status_var_init();
   void reset_n_backup_open_tables_state(Open_tables_backup *backup);
   void restore_backup_open_tables_state(Open_tables_backup *backup);