diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-15 14:16:49 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-15 14:16:49 +0300 |
| commit | 6c32fa735717e91a1de369bc8fe7d73ef9ff224a (patch) | |
| tree | 2c79edc43ff38be4c2de71e4fee4285523f5c08c /sql/rpl_rli.cc | |
| parent | 0ec868ca0e2d3ea60835d7c8fa7b951182b497b1 (diff) | |
| parent | 2fa7509bf07761e041c5702f3b833b7fefb3ec61 (diff) | |
| download | mariadb-git-6c32fa735717e91a1de369bc8fe7d73ef9ff224a.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/log_event.cc
- sql/sql_class.h
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 54124ff30e4..e1c43771b32 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -124,7 +124,7 @@ int init_relay_log_info(Relay_log_info* rli, /* The relay log will now be opened, as a SEQ_READ_APPEND IO_CACHE. Note that the I/O thread flushes it to disk after writing every - event, in flush_master_info(mi, 1). + event, in flush_master_info(mi, 1, ?). */ /* |