summaryrefslogtreecommitdiff
path: root/sql/mdl.h
diff options
context:
space:
mode:
authorDmitry Lenev <dlenev@mysql.com>2010-07-13 22:01:54 +0400
committerDmitry Lenev <dlenev@mysql.com>2010-07-13 22:01:54 +0400
commita6a8e10c799d093e13ec136b960703f9b657df74 (patch)
tree4328a9af64ff226ba0124e3512d231fd4d258f98 /sql/mdl.h
parentf45523188e57575eeed5f7fbe8fbefc06de4b6f3 (diff)
downloadmariadb-git-a6a8e10c799d093e13ec136b960703f9b657df74.tar.gz
A pre-requisite for patch fixing bug #52044 "FLUSH TABLES
WITH READ LOCK and FLUSH TABLES <list> WITH READ LOCK are incompatible", which adds information about waits caused by FLUSH TABLES statement to deadlock detector in MDL subsystem. Remove API supporting caching of pointers to TABLE_SHARE object in MDL subsystem and all code related to it. The problem was that locking requirements of code implementing this API conflicted with locking requirements of code which adds information about waits caused by flushes to deadlock detector in MDL subsystem (the former needed to lock LOCK_open or its future equivalent while having write-lock on MDL_lock's rwlock, and the latter needs to be able to read-lock MDL_lock rwlock while owning LOCK_open or its future equivalent). Since caching of pointers to TABLE_SHARE objects in MDL subsystem didn't bring expected performance benefits we decided to remove caching API rather than try to come up with some complex solution for this problem.
Diffstat (limited to 'sql/mdl.h')
-rw-r--r--sql/mdl.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/mdl.h b/sql/mdl.h
index 5c58289aea2..319c16cf6ce 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -398,9 +398,6 @@ public:
public:
bool has_pending_conflicting_lock() const;
- void *get_cached_object();
- void set_cached_object(void *cached_object);
- void clear_cached_object();
MDL_context *get_ctx() const { return m_ctx; }
bool is_upgradable_or_exclusive() const
{
@@ -728,7 +725,6 @@ extern "C" const char *set_thd_proc_info(void *thd_arg, const char *info,
const char *calling_function,
const char *calling_file,
const unsigned int calling_line);
-extern void tdc_release_cached_share(void *ptr);
#ifndef DBUG_OFF
extern mysql_mutex_t LOCK_open;
#endif