From 4bb40187438bdfb8b1d8b091399bd01e0e3425c1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 6 Aug 2001 16:47:48 -0600 Subject: misc bug fixes libmysqld/Makefile.am: sql_unions -> sql_union BitKeeper/etc/ignore: Added libmysqld/sql_union.cc to the ignore list mysql-test/mysql-test-run.sh: fix to get path-independent logging mysql-test/r/rpl_log.result: fix for path-independent logging sql/log.cc: fixed compile error with USING_TRANSACTIONS sql/log_event.h: fixed compile error with USING_TRANSACTIONS --- sql/log.cc | 2 +- sql/log_event.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/log.cc b/sql/log.cc index ba09ac86fe6..8976cb87375 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -653,7 +653,7 @@ bool MYSQL_LOG::write(Log_event* event_info) THD *thd=event_info->thd; const char* db = event_info->get_db(); #ifdef USING_TRANSACTIONS - IO_CACHE *file = ((event_info->cache_stmt && thd) ? + IO_CACHE *file = ((event_info->get_cache_stmt() && thd) ? &thd->transaction.trans_log : &log_file); #else diff --git a/sql/log_event.h b/sql/log_event.h index 2165a620fa3..d16d76bed37 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -210,6 +210,7 @@ public: { return 0; } virtual Log_event_type get_type_code() = 0; virtual bool is_valid() = 0; + virtual bool get_cache_stmt() { return 0; } Log_event(const char* buf); #ifndef MYSQL_CLIENT Log_event(THD* thd_arg, uint16 flags_arg = 0); @@ -277,6 +278,7 @@ public: const char* get_db() { return db; } void pack_info(String* packet); int exec_event(struct st_master_info* mi); + bool get_cache_stmt() { return cache_stmt; } #endif Query_log_event(const char* buf, int event_len); -- cgit v1.2.1