diff options
| author | unknown <mats@romeo.(none)> | 2006-12-21 19:36:28 +0100 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2006-12-21 19:36:28 +0100 |
| commit | c3315ccca9790db558c854239547d324cd97ab66 (patch) | |
| tree | 9c48d811e5bac1a0fbe447b8ae9e1462dc428d7d /sql/log.h | |
| parent | 6d310813ba93bcd4d203925f6f5d9ae52cf9ffe3 (diff) | |
| parent | 3d68c135d0daa8030665a0a3b9b85e18c9cb76d9 (diff) | |
| download | mariadb-git-c3315ccca9790db558c854239547d324cd97ab66.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
sql/log.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/log.cc:
Merge with mysql-5.1-new-rpl
sql/slave.cc:
Merge with mysql-5.1-new-rpl
sql/sql_insert.cc:
Merge with mysql-5.1-new-rpl
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 2 |
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); |