diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-05-28 19:13:31 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-05-28 19:13:31 -0300 |
commit | 1164841167ce62d213fd0084aad376be8fcc371b (patch) | |
tree | eef16fecac880a9779e086028ad9f933d3e53c6d /sql/lock.h | |
parent | 92f659e7a34153b2eed6340356ac505704567c7c (diff) | |
download | mariadb-git-1164841167ce62d213fd0084aad376be8fcc371b.tar.gz |
Backport: Remove unused and ancient files, functions, and facilities.
client/mysql.cc:
Remove unused functions.
client/sql_string.cc:
Remove unused functions.
include/my_pthread.h:
Remove unused prototype.
mysys/my_pthread.c:
Remove unused function.
sql/lock.cc:
Remove unused function.
sql/lock.h:
Remove unused and duplicated prototypes.
sql/sql_class.h:
Removed unused variables.
sql/sql_const.h:
Remove unused defines.
sql/sql_priv.h:
Remove unused defines.
sql/sql_string.cc:
Remove unused prototype.
sql/thr_malloc.cc:
Remove unused function.
sql/thr_malloc.h:
Remove unused prototype.
storage/myisam/CMakeLists.txt:
Remove obsolete fulltext file.
storage/myisam/Makefile.am:
Remove obsolete files (were already commented out).
storage/myisam/ft_eval.c:
Remove obsolete fulltext file.
storage/myisam/ft_eval.h:
Remove obsolete fulltext file.
storage/myisam/ft_stem.c:
Remove obsolete fulltext file.
storage/myisam/ft_test1.c:
Remove obsolete fulltext file.
storage/myisam/ft_test1.h:
Remove obsolete fulltext file.
Diffstat (limited to 'sql/lock.h')
-rw-r--r-- | sql/lock.h | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/sql/lock.h b/sql/lock.h index 19b23f1f42b..f7c19913675 100644 --- a/sql/lock.h +++ b/sql/lock.h @@ -53,52 +53,22 @@ typedef struct st_mysql_lock MYSQL_LOCK; MYSQL_OPEN_HAS_MDL_LOCK) -#include "thr_lock.h" /* thr_lock_type */ - -struct TABLE_LIST; -class THD; -struct TABLE; -typedef struct st_mysql_lock MYSQL_LOCK; - MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count, uint flags); void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count); void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table); void mysql_lock_abort(THD *thd, TABLE *table, bool upgrade_lock); -void mysql_lock_downgrade_write(THD *thd, TABLE *table, - thr_lock_type new_lock_type); bool mysql_lock_abort_for_thread(THD *thd, TABLE *table); MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b); TABLE_LIST *mysql_lock_have_duplicate(THD *thd, TABLE_LIST *needle, TABLE_LIST *haystack); -bool lock_global_read_lock(THD *thd); -void unlock_global_read_lock(THD *thd); -bool wait_if_global_read_lock(THD *thd, bool abort_on_refresh, - bool is_not_commit); -void start_waiting_global_read_lock(THD *thd); -bool make_global_read_lock_block_commit(THD *thd); -bool set_protect_against_global_read_lock(void); -void unset_protect_against_global_read_lock(void); -/* Lock based on stored routine name */ -bool lock_routine_name(THD *thd, bool is_function, const char *db, - const char *name); void broadcast_refresh(void); - /* Lock based on name */ -int lock_and_wait_for_table_name(THD *thd, TABLE_LIST *table_list); -int lock_table_name(THD *thd, TABLE_LIST *table_list, bool check_in_use); -void unlock_table_name(THD *thd, TABLE_LIST *table_list); -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); -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); -void broadcast_refresh(void); - - +/* Lock based on stored routine name */ +bool lock_routine_name(THD *thd, bool is_function, const char *db, + const char *name); #endif /* LOCK_INCLUDED */ |