diff options
| author | thek@adventure.(none) <> | 2007-07-02 21:03:10 +0200 |
|---|---|---|
| committer | thek@adventure.(none) <> | 2007-07-02 21:03:10 +0200 |
| commit | 08e7d2d3128ec4d5313b0a481020ad6687ced9f9 (patch) | |
| tree | 22952496fda992e3bdada73b563098c2f9e3bbea /sql/mysql_priv.h | |
| parent | 1550a5ddee810a9d45fb3e779e19023001684792 (diff) | |
| parent | 863e882785762bbde5b11bee7fd4568dc46d5794 (diff) | |
| download | mariadb-git-08e7d2d3128ec4d5313b0a481020ad6687ced9f9.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ae7c4ca5f3f..e0de89a5b74 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -901,10 +901,8 @@ void mysql_client_binlog_statement(THD *thd); bool mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists, my_bool drop_temporary); int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, - bool drop_temporary, bool drop_view, bool log_query); -int mysql_rm_table_part2_with_lock(THD *thd, TABLE_LIST *tables, - bool if_exists, bool drop_temporary, - bool log_query); + bool drop_temporary, bool drop_view, bool log_query, + bool need_lock_open); bool quick_rm_table(handlerton *base,const char *db, const char *table_name, uint flags); void close_cached_table(THD *thd, TABLE *table); @@ -1882,6 +1880,11 @@ bool wait_for_locked_table_names(THD *thd, TABLE_LIST *table_list); bool lock_table_names(THD *thd, TABLE_LIST *table_list); void unlock_table_names(THD *thd, TABLE_LIST *table_list, TABLE_LIST *last_table); +bool lock_table_names_exclusively(THD *thd, TABLE_LIST *table_list); +bool is_table_name_exclusively_locked_by_this_thread(THD *thd, + TABLE_LIST *table_list); +bool is_table_name_exclusively_locked_by_this_thread(THD *thd, uchar *key, + int key_length); /* old unireg functions */ |