diff options
| author | Mikael Ronström <mikael@dator9> | 2011-04-15 15:46:11 +0200 |
|---|---|---|
| committer | Mikael Ronström <mikael@dator9> | 2011-04-15 15:46:11 +0200 |
| commit | 7b079a3a7e3a7e38353728e8e19a1ea44a2f5778 (patch) | |
| tree | a3b95707a820bf6af5adbb68c73f6f51dbf5b473 /sql/rpl_rli.cc | |
| parent | 97036a97a186a7eddf9d36a987338f2144aefa1d (diff) | |
| parent | 506ff594c8553723770e9f097c0e72c31859d7ad (diff) | |
| download | mariadb-git-7b079a3a7e3a7e38353728e8e19a1ea44a2f5778.tar.gz | |
Merge 5.5
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index df20690d8d8..9a5c7521752 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -56,6 +56,13 @@ Relay_log_info::Relay_log_info(bool is_slave_recovery) { DBUG_ENTER("Relay_log_info::Relay_log_info"); +#ifdef HAVE_PSI_INTERFACE + relay_log.set_psi_keys(key_RELAYLOG_LOCK_index, + key_RELAYLOG_update_cond, + key_file_relaylog, + key_file_relaylog_index); +#endif + group_relay_log_name[0]= event_relay_log_name[0]= group_master_log_name[0]= 0; until_log_name[0]= ign_master_log_name_end[0]= 0; @@ -358,7 +365,7 @@ static inline int add_relay_log(Relay_log_info* rli,LOG_INFO* linfo) { MY_STAT s; DBUG_ENTER("add_relay_log"); - if (!mysql_file_stat(key_file_binlog, + if (!mysql_file_stat(key_file_relaylog, linfo->log_file_name, &s, MYF(0))) { sql_print_error("log %s listed in the index, but failed to stat", |