diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 17:46:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 17:46:46 +0100 |
| commit | 750b9147fced7202b541be946e044eb739b20a03 (patch) | |
| tree | cb378c2d311993254aec75d4d81a5f32a2dcb71d /include | |
| parent | a87eab6061068491ec9004ae54c46630619cb531 (diff) | |
| download | mariadb-git-750b9147fced7202b541be946e044eb739b20a03.tar.gz | |
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)
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/plugin.h | 12 | ||||
| -rw-r--r-- | include/mysql/plugin_audit.h.pp | 1 | ||||
| -rw-r--r-- | include/mysql/plugin_auth.h.pp | 1 | ||||
| -rw-r--r-- | include/mysql/plugin_ftparser.h.pp | 1 |
4 files changed, 0 insertions, 15 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 7617f5968d9..d30abb190d0 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -642,18 +642,6 @@ int mysql_tmpfile(const char *prefix); int thd_killed(const MYSQL_THD thd); /** - Increase level of kill ; Ensures that thd_killed() returns true. - - @param thd Thread connection handle - - @details - 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. -**/ - -void thd_mark_as_hard_kill(MYSQL_THD thd); - -/** Return the thread id of a user thread @param thd user thread connection handle diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp index ea3447762ca..b987f690592 100644 --- a/include/mysql/plugin_audit.h.pp +++ b/include/mysql/plugin_audit.h.pp @@ -227,7 +227,6 @@ char *thd_security_context(void* thd, char *buffer, unsigned int length, void thd_inc_row_count(void* thd); int mysql_tmpfile(const char *prefix); int thd_killed(const void* thd); -void thd_mark_as_hard_kill(void* thd); unsigned long thd_get_thread_id(const void* thd); void thd_get_xid(const void* thd, MYSQL_XID *xid); void mysql_query_cache_invalidate4(void* thd, diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index 45999056435..113aaf62d19 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -227,7 +227,6 @@ char *thd_security_context(void* thd, char *buffer, unsigned int length, void thd_inc_row_count(void* thd); int mysql_tmpfile(const char *prefix); int thd_killed(const void* thd); -void thd_mark_as_hard_kill(void* thd); unsigned long thd_get_thread_id(const void* thd); void thd_get_xid(const void* thd, MYSQL_XID *xid); void mysql_query_cache_invalidate4(void* thd, diff --git a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp index 84299c77d9b..6011e7f7519 100644 --- a/include/mysql/plugin_ftparser.h.pp +++ b/include/mysql/plugin_ftparser.h.pp @@ -180,7 +180,6 @@ char *thd_security_context(void* thd, char *buffer, unsigned int length, void thd_inc_row_count(void* thd); int mysql_tmpfile(const char *prefix); int thd_killed(const void* thd); -void thd_mark_as_hard_kill(void* thd); unsigned long thd_get_thread_id(const void* thd); void thd_get_xid(const void* thd, MYSQL_XID *xid); void mysql_query_cache_invalidate4(void* thd, |