diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-20 14:22:46 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-20 14:22:46 +0300 |
| commit | a54c3dd5c0080bd6d2834478f5f5b4fc637fcc99 (patch) | |
| tree | abdc965c92ac02057c93a78984ba3e9958312d87 /sql/log.h | |
| parent | 3166b9153a4b879446de8bc34802a1c1ab9345ad (diff) | |
| parent | bbaad8880e4329d8e01c359051fc39eb3192dda0 (diff) | |
| download | mariadb-git-a54c3dd5c0080bd6d2834478f5f5b4fc637fcc99.tar.gz | |
merge
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.h b/sql/log.h index 6e87b6cbade..ebb23deda81 100644 --- a/sql/log.h +++ b/sql/log.h @@ -394,10 +394,10 @@ public: /* Use this to start writing a new log file */ void new_file(); - bool write(Log_event* event_info); + 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); + 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); |