diff options
| author | sasha@mysql.sashanet.com <> | 2000-11-27 11:13:05 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-11-27 11:13:05 -0700 |
| commit | 93c0180805535621db1b2a4bb3761aaf6a6d5404 (patch) | |
| tree | 66e0033b6a729fa25769f98640f7ec7b1bfc719f /sql/mysql_priv.h | |
| parent | d250a4eef83c0d155996a143bba1ba04026b0280 (diff) | |
| parent | f43e7910b5d43006ea64871b925846e143c568ec (diff) | |
| download | mariadb-git-93c0180805535621db1b2a4bb3761aaf6a6d5404.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 10e470ffc78..efc4183092a 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -401,7 +401,7 @@ void close_temporary_tables(THD *thd); TABLE **find_temporary_table(THD *thd, const char *db, const char *table_name); bool close_temporary_table(THD *thd, const char *db, const char *table_name); void close_temporary(TABLE *table, bool delete_table=1); -bool rename_temporary_table(TABLE *table, const char *new_db, +bool rename_temporary_table(THD* thd, TABLE *table, const char *new_db, const char *table_name); void remove_db_from_cache(const my_string db); void flush_tables(); @@ -455,7 +455,8 @@ extern ulong refresh_version,flush_version, thread_id,query_id,opened_tables, extern ulong filesort_rows, filesort_range_count, filesort_scan_count; extern ulong filesort_merge_passes; extern ulong select_range_check_count, select_range_count, select_scan_count; -extern ulong select_full_range_join_count,select_full_join_count; +extern ulong select_full_range_join_count,select_full_join_count, + slave_open_temp_tables; extern uint test_flags,select_errors,mysql_port,ha_open_options; extern ulong thd_startup_options, slow_launch_threads, slow_launch_time; extern time_t start_time; |