diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-29 17:26:32 +0300 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-29 17:26:32 +0300 |
commit | 216418e7b2b4fe6a856f2043ca7297d8ca124d8a (patch) | |
tree | 92b3d8d0f9acdc9f7c1f8e5daef666cd9a58b9af /sql/log.h | |
parent | 76f4cfde66303514b1929acfe01e78a31943f71d (diff) | |
parent | b5bc68c52441fa05f8f41fecf30684a16260452f (diff) | |
download | mariadb-git-216418e7b2b4fe6a856f2043ca7297d8ca124d8a.tar.gz |
merge
Diffstat (limited to 'sql/log.h')
-rw-r--r-- | sql/log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index 5df05e7ff90..89b3594cd1e 100644 --- a/sql/log.h +++ b/sql/log.h @@ -396,8 +396,8 @@ public: bool write(Log_event* event_info); // binary log write bool write(THD *thd, IO_CACHE *cache, Log_event *commit_event, bool incident); - bool write_incident(THD *thd, bool lock); + int write_cache(IO_CACHE *cache, bool lock_log, bool flush_and_sync); void set_write_error(THD *thd); bool check_write_error(THD *thd); |