summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-09-30 12:43:43 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-09-30 12:43:43 +0200
commita53f61e6e83c2feaee509f5d793d2c033acb63f1 (patch)
tree3c8bad484e298eb47244274edb7d539f0f81b691 /sql/sql_base.h
parent49406b97dfe1d54709eae4aa1234d0071b6667ad (diff)
parentc70a6f5c234dc18744a3305d5a601630bfd4ae75 (diff)
downloadmariadb-git-a53f61e6e83c2feaee509f5d793d2c033acb63f1.tar.gz
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r--sql/sql_base.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h
index 7ae3971942b..509760909da 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -70,6 +70,8 @@ enum enum_tdc_remove_table_type {TDC_RT_REMOVE_ALL, TDC_RT_REMOVE_NOT_OWN,
bool check_dup(const char *db, const char *name, TABLE_LIST *tables);
extern mysql_mutex_t LOCK_open;
+extern mysql_mutex_t LOCK_dd_owns_lock_open;
+extern uint dd_owns_lock_open;
bool table_cache_init(void);
void table_cache_free(void);
bool table_def_init(void);