summaryrefslogtreecommitdiff
path: root/sql/log.h
diff options
context:
space:
mode:
authormats@romeo.(none) <>2006-12-21 19:36:28 +0100
committermats@romeo.(none) <>2006-12-21 19:36:28 +0100
commit8d4bddefd0b1b7ed780dd4ab7de1f966d4527fd0 (patch)
tree9c48d811e5bac1a0fbe447b8ae9e1462dc428d7d /sql/log.h
parent4722743cae0e19a3025d688e87a17159ba4a0b73 (diff)
parentbe9ffb12da78f157793b4d7445b98ca732aa42da (diff)
downloadmariadb-git-8d4bddefd0b1b7ed780dd4ab7de1f966d4527fd0.tar.gz
Merge romeo.(none):/home/bk/b22864-mysql-5.1-new-rpl
into romeo.(none):/home/bk/merge-b22864-myql-5.1-new-rpl
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.h b/sql/log.h
index 2316c96f266..80c97b8db39 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -340,6 +340,8 @@ public:
bool write(Log_event* event_info); // binary log write
bool write(THD *thd, IO_CACHE *cache, Log_event *commit_event);
+ int write_cache(IO_CACHE *cache, bool lock_log, bool flush_and_sync);
+
void start_union_events(THD *thd);
void stop_union_events(THD *thd);
bool is_query_in_union(THD *thd, query_id_t query_id_param);