diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2000-11-28 13:46:59 -0500 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2000-11-28 13:46:59 -0500 |
| commit | 53c0d95e924c7ea8ef67af2c85856c2e26b6d2da (patch) | |
| tree | deea4395a31d3b03972297e4c33d6f7def1e6a9d /sql/mysql_priv.h | |
| parent | c1fdd5b55afab11e981929519b96294cac4f1e04 (diff) | |
| parent | 289244acf3e507ee4951edc4df816ba4e6f35a24 (diff) | |
| download | mariadb-git-53c0d95e924c7ea8ef67af2c85856c2e26b6d2da.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work
Docs/manual.texi:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 2e2452a0020..ef6f1e7a81e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -422,6 +422,17 @@ int mysql_load(THD *thd,sql_exchange *ex, TABLE_LIST *table_list, List<Item> &fields, enum enum_duplicates handle_duplicates, bool local_file,thr_lock_type lock_type); int write_record(TABLE *table,COPY_INFO *info); + +/* sql_manager.cc */ +/* bits set in manager_status */ +#define MANAGER_BERKELEY_LOG_CLEANUP (1L << 0) +extern ulong manager_status; +extern bool volatile manager_thread_in_use; +extern pthread_t manager_thread; +extern pthread_mutex_t LOCK_manager; +extern pthread_cond_t COND_manager; +pthread_handler_decl(handle_manager, arg); + /* sql_test.cc */ #ifndef DBUG_OFF void print_where(COND *cond,const char *info); |