diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-01 18:09:06 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-01 18:09:06 +0200 |
| commit | 4cace76d4d3d75cf94762497937479c475d12167 (patch) | |
| tree | 9c7bad491bb0762dfb460bdd9dc9c58b840a3e49 /sql/sql_base.h | |
| parent | 492c3b09d2b3c11ebb043276ff4b245d54d99fd0 (diff) | |
| parent | 8ed283d882e7147b1caa3f90f708720c94446024 (diff) | |
| download | mariadb-git-4cace76d4d3d75cf94762497937479c475d12167.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 21a2ff322f0..110f2abbd1d 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -60,7 +60,8 @@ enum find_item_error_report_type {REPORT_ALL_ERRORS, REPORT_EXCEPT_NOT_FOUND, IGNORE_EXCEPT_NON_UNIQUE}; enum enum_tdc_remove_table_type {TDC_RT_REMOVE_ALL, TDC_RT_REMOVE_NOT_OWN, - TDC_RT_REMOVE_UNUSED}; + TDC_RT_REMOVE_UNUSED, + TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE}; /* bits for last argument to remove_table_from_cache() */ #define RTFC_NO_FLAG 0x0000 @@ -153,6 +154,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update, */ #define MYSQL_OPEN_SKIP_SCOPED_MDL_LOCK 0x1000 #define MYSQL_LOCK_NOT_TEMPORARY 0x2000 +#define MYSQL_OPEN_FOR_REPAIR 0x4000 /** Please refer to the internals manual. */ #define MYSQL_OPEN_REOPEN (MYSQL_OPEN_IGNORE_FLUSH |\ @@ -254,7 +256,9 @@ bool setup_tables_and_check_access(THD *thd, ulong want_access, bool full_table_list); bool wait_while_table_is_used(THD *thd, TABLE *table, - enum ha_extra_function function); + enum ha_extra_function function, + enum_tdc_remove_table_type remove_type= + TDC_RT_REMOVE_NOT_OWN); void drop_open_table(THD *thd, TABLE *table, const char *db_name, const char *table_name); |