diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-02-03 17:19:58 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-02-03 17:19:58 +0000 |
| commit | 6dd801d7b7b813382c304f0787709031897af1dc (patch) | |
| tree | d4c383865865c897dc5f361924955f2260e97db1 /sql/rpl_rli.cc | |
| parent | ac8e3fee1e88d826e80bc38a8e6813cf2911afb1 (diff) | |
| parent | d0ffa8e51b104839a9e397aacda8ca1f110e3fad (diff) | |
| download | mariadb-git-6dd801d7b7b813382c304f0787709031897af1dc.tar.gz | |
BUG#50364: manual merge to mysql-next-mr-bugfixing.
Conflicts
=========
Text conflict in sql/repl_failsafe.cc
Additional changes
==================
Replace references to pthread_mutex with mysql_mutex
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 a982cfd25a4..1b3c25dfda2 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -123,7 +123,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, ?). */ /* |