summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-05-03 12:10:16 +0200
committerunknown <knielsen@knielsen-hq.org>2013-05-03 12:10:16 +0200
commitd0d05dae079554e1b7d4dd62ca8b364a8076510e (patch)
tree57e89ca0480ac96947450dfc3f283753bd4c9034 /sql/rpl_rli.cc
parent56d485e2b5d4bbc6ab20eb8e82197e9a557bb327 (diff)
parent5aa0d185ca18cf538eea5c9c501e1e342b41b274 (diff)
downloadmariadb-git-d0d05dae079554e1b7d4dd62ca8b364a8076510e.tar.gz
Merge 10.0-base -> 10.0
Diffstat (limited to 'sql/rpl_rli.cc')
-rw-r--r--sql/rpl_rli.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index ee1da6e9052..6add94580a3 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -214,17 +214,18 @@ a file name for --relay-log-index option", opt_relaylog_index_name);
char buf_relay_logname[FN_REFLEN], buf_relaylog_index_name_buff[FN_REFLEN];
char *buf_relaylog_index_name= opt_relaylog_index_name;
- create_logfile_name_with_suffix(buf_relay_logname, sizeof(buf_relay_logname),
- ln, 1, &mi->connection_name);
+ create_logfile_name_with_suffix(buf_relay_logname,
+ sizeof(buf_relay_logname),
+ ln, 1, &mi->cmp_connection_name);
ln= buf_relay_logname;
if (opt_relaylog_index_name)
{
buf_relaylog_index_name= buf_relaylog_index_name_buff;
create_logfile_name_with_suffix(buf_relaylog_index_name_buff,
- sizeof(buf_relaylog_index_name_buff),
- opt_relaylog_index_name, 0,
- &mi->connection_name);
+ sizeof(buf_relaylog_index_name_buff),
+ opt_relaylog_index_name, 0,
+ &mi->cmp_connection_name);
}
/*