From d18a6cc33a220e056dfa1633b928ac0b1415789d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Nov 2001 01:04:08 +0200 Subject: Fixes up things after merge from 3.23.44 Portability fixes. Don't delete temporary tables on FLUSH tables. client/client_priv.h: Fix after merge client/mysqldump.c: Fix after merge include/my_global.h: Change CMP -> CMP_NUM because CMP was used in other places include/violite.h: Added missing prototype myisam/ft_boolean_search.c: Removed warnings myisam/ft_nlq_search.c: Removed warnings myisam/mi_search.c: CMP -> CMP_NUM mysql-test/mysql-test-run.sh: Write all logs to log directory mysql-test/r/func_time.result: Fix test results after merge mysql-test/r/having.result: Fix test results after merge mysql-test/r/join.result: Fix test results after merge mysql-test/r/rpl000012.result: Fix test results after merge mysys/mf_iocache.c: Allow multiple call to end_iocache. sql/ha_innobase.cc: Removed possible problem with using uninitialized variable sql/log_event.cc: Don't delete temporary tables on FLUSH tables. (Needs to be fixed properly) --- sql/log_event.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'sql/log_event.cc') diff --git a/sql/log_event.cc b/sql/log_event.cc index 5bd386c7b29..6db0c3ef9f7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1657,14 +1657,21 @@ int Load_log_event::exec_event(NET* net, struct st_master_info* mi) int Start_log_event::exec_event(struct st_master_info* mi) { +#ifdef TO_BE_DELETED + /* + We can't close temporary files or cleanup the tmpdir here, becasue + someone may have just rotated the logs on the master. + We should only do this cleanup when we know the master restarted. + */ close_temporary_tables(thd); cleanup_load_tmpdir(); +#endif return Log_event::exec_event(mi); } int Stop_log_event::exec_event(struct st_master_info* mi) { - if(mi->pos > 4) // stop event should be ignored after rotate event + if (mi->pos > 4) // stop event should be ignored after rotate event { close_temporary_tables(thd); cleanup_load_tmpdir(); -- cgit v1.2.1