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 | 6a0cfa23bd11e70e398a8803f8204ae6429a9764 (patch) | |
| tree | 92b3d8d0f9acdc9f7c1f8e5daef666cd9a58b9af /sql/log.h | |
| parent | 7f552e46089b4e35edc92a70aba291441e33a813 (diff) | |
| parent | 292e1af26e0c6921f6b36ca30dbda104e8e7a8d2 (diff) | |
| download | mariadb-git-6a0cfa23bd11e70e398a8803f8204ae6429a9764.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); |