diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-11 19:40:58 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-11 19:40:58 +0300 |
| commit | 72b2943594036ce9f737dbe81cf32505970fd063 (patch) | |
| tree | ad3ff84791c35c7d8b2d47a60f0ea4cb409a0a31 /sql/rpl_rli.cc | |
| parent | 69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4 (diff) | |
| parent | b358f61bc76e79e872c587bda7f953180a01125e (diff) | |
| download | mariadb-git-72b2943594036ce9f737dbe81cf32505970fd063.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index a1403d2ff71..269ae0e6d68 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -183,10 +183,10 @@ a file name for --relay-log-index option", opt_relaylog_index_name); note, that if open() fails, we'll still have index file open but a destructor will take care of that */ - if (rli->relay_log.open_index_file(opt_relaylog_index_name, ln) || + if (rli->relay_log.open_index_file(opt_relaylog_index_name, ln, TRUE) || rli->relay_log.open(ln, LOG_BIN, 0, SEQ_READ_APPEND, 0, (max_relay_log_size ? max_relay_log_size : - max_binlog_size), 1)) + max_binlog_size), 1, TRUE)) { pthread_mutex_unlock(&rli->data_lock); sql_print_error("Failed in open_log() called from init_relay_log_info()"); |