diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-25 23:29:01 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-25 23:29:01 -0700 |
| commit | c3cc5856a5d9ee8fa3d01207613f961ae110b2cd (patch) | |
| tree | a230abbd46e3341756e3e5629a69736b6a057239 /sql/mysql_priv.h | |
| parent | 80db9fb3c95519383bbae73aa8cfc0773bf7c40f (diff) | |
| download | mariadb-git-c3cc5856a5d9ee8fa3d01207613f961ae110b2cd.tar.gz | |
Fixed temp tables to work with replication. It will not work if you stop the slave
while slave thread has temp tables - not hard to fix though, but it is time to go to bed
added a new test case for temp table replication and Slave_open_temp_tables
status variable.
Misc fixes
client/mysqltest.c:
added disconnect command
mysql-test/create-test-result:
fixed bugs so it actually works
mysql-test/t/include/master-slave.inc:
establish alternate connections to master and slave
sql/mysql_priv.h:
Slave_open_temp_tables
sql/mysqlbinlog.cc:
fixed a bug in reading local binlogs
sql/mysqld.cc:
added Slave_open_temp_tables status variable
sql/slave.cc:
fixed freed memory reference in the error message
sql/sql_class.cc:
slave_proxy_id
sql/sql_class.h:
slave_proxy_id
sql/sql_parse.cc:
small optimization - reorder eval in &&
BitKeeper/etc/ignore:
Added mysql-test/r/3.23/rpl000001.b.result.reject mysql-test/r/3.23/rpl000012.result.reject to the ignore list
sql/sql_table.cc:
added THD arg to rename_temporary_table
sql/unireg.h:
the table_cache_key is now 4 bytes longer
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 eca9eca56c4..1b2f64e3d76 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -397,7 +397,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(); @@ -451,7 +451,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; |