summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-10-25 12:53:40 +0200
committerunknown <knielsen@knielsen-hq.org>2011-10-25 12:53:40 +0200
commit5da52cd108468580f036b479be77ef80c64d1181 (patch)
tree5aba76b06329ff2c6ef9d6f277ad57c027728ddc /sql/rpl_rli.cc
parent90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8 (diff)
downloadmariadb-git-5da52cd108468580f036b479be77ef80c64d1181.tar.gz
Some after-merge fixes for 5.5 merge.
Diffstat (limited to 'sql/rpl_rli.cc')
-rw-r--r--sql/rpl_rli.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 63ce14c3f89..3b1f3180443 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -61,7 +61,8 @@ Relay_log_info::Relay_log_info(bool is_slave_recovery)
relay_log.set_psi_keys(key_RELAYLOG_LOCK_index,
key_RELAYLOG_update_cond,
key_file_relaylog,
- key_file_relaylog_index);
+ key_file_relaylog_index,
+ key_RELAYLOG_COND_queue_busy);
#endif
group_relay_log_name[0]= event_relay_log_name[0]=