summaryrefslogtreecommitdiff
path: root/sql/rpl_handler.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-07-25 00:41:54 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-07-25 00:41:54 +0300
commit786ad0a158f92eae0d65b02f34e864a7bbd8390e (patch)
tree8b796ce3ce81ab3c1f73e6eb5c594c74619810c0 /sql/rpl_handler.cc
parent2ce3f95151a424f950be40140c45b0ba583e07ab (diff)
parentc8a0244e957bc4beff453f09c881bb51752d682c (diff)
downloadmariadb-git-786ad0a158f92eae0d65b02f34e864a7bbd8390e.tar.gz
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/rpl_handler.cc')
-rw-r--r--sql/rpl_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc
index 917a9d11b5a..d97e0e07f52 100644
--- a/sql/rpl_handler.cc
+++ b/sql/rpl_handler.cc
@@ -261,7 +261,7 @@ int Binlog_storage_delegate::after_flush(THD *thd,
thd->semisync_info= log_info;
}
- strcpy(log_info->log_file, log_file+dirname_length(log_file));
+ strmake_buf(log_info->log_file, log_file+dirname_length(log_file));
log_info->log_pos = log_pos;
FOREACH_OBSERVER(ret, after_flush, false,