diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-19 16:30:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-19 22:05:55 +0200 |
| commit | 91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9 (patch) | |
| tree | 2a21bd15ac2547c12f0f60a8a5f680f0c996cd9b /sql/sql_base.h | |
| parent | f76a17e355f4ee031f3cabbbd679643d85347834 (diff) | |
| parent | c1b5d2801e81443c8ad02823e12d54f662e4c801 (diff) | |
| download | mariadb-git-91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index e66532ffc95..74154184ebc 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -61,6 +61,10 @@ enum find_item_error_report_type {REPORT_ALL_ERRORS, REPORT_EXCEPT_NOT_FOUND, IGNORE_ERRORS, REPORT_EXCEPT_NON_UNIQUE, IGNORE_EXCEPT_NON_UNIQUE}; +/* Flag bits for unique_table() */ +#define CHECK_DUP_ALLOW_DIFFERENT_ALIAS 1 +#define CHECK_DUP_FOR_CREATE 2 + uint create_tmp_table_def_key(THD *thd, char *key, const char *db, const char *table_name); uint get_table_def_key(const TABLE_LIST *table_list, const char **key); @@ -280,7 +284,7 @@ void kill_delayed_threads_for_table(TDC_element *element); void close_thread_table(THD *thd, TABLE **table_ptr); bool close_temporary_tables(THD *thd); TABLE_LIST *unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list, - bool check_alias); + uint check_flag); int drop_temporary_table(THD *thd, TABLE *table, bool *is_trans); void close_temporary_table(THD *thd, TABLE *table, bool free_share, bool delete_table); |