diff options
| author | pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2005-07-21 01:29:57 -0400 |
|---|---|---|
| committer | pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2005-07-21 01:29:57 -0400 |
| commit | 6026054ead01bb2f733529b1a3aa4382a2ced2c0 (patch) | |
| tree | f28d036bdc60c31c38b1d066b2d9e02fa4e980e6 /sql/mysql_priv.h | |
| parent | 69a3209275369e799588a52b3fa748413932e3dc (diff) | |
| parent | ac6623f08fe059e4ee49c4f3eaa73198b8ca9d82 (diff) | |
| download | mariadb-git-6026054ead01bb2f733529b1a3aa4382a2ced2c0.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7bd8d76f25d..3db56a2a9d1 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -951,8 +951,12 @@ bool rename_temporary_table(THD* thd, TABLE *table, const char *new_db, const char *table_name); void remove_db_from_cache(const char *db); void flush_tables(); +#define RTFC_NO_FLAG 0x0000 +#define RTFC_OWNED_BY_THD_FLAG 0x0001 +#define RTFC_WAIT_OTHER_THREAD_FLAG 0x0002 +#define RTFC_CHECK_KILLED_FLAG 0x0004 bool remove_table_from_cache(THD *thd, const char *db, const char *table, - bool return_if_owned_by_thd); + uint flags); bool close_cached_tables(THD *thd, bool wait_for_refresh, TABLE_LIST *tables); void copy_field_from_tmp_record(Field *field,int offset); bool fill_record(THD *thd, Field **field, List<Item> &values, @@ -1215,7 +1219,7 @@ 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); -void mysql_lock_abort_for_thread(THD *thd, TABLE *table); +bool mysql_lock_abort_for_thread(THD *thd, TABLE *table); MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b); bool lock_global_read_lock(THD *thd); void unlock_global_read_lock(THD *thd); |