diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-07 13:59:31 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-07 13:59:31 +0100 |
commit | 65c5ef9b495bac078ad2a502a75801c7cfe5b95a (patch) | |
tree | 266859fc4e22dcd18112a25e8a3e4f9d93a043a0 /sql/sql_repl.cc | |
parent | 7293ce0ee81f05b1ec3ac9ddcc88bfbee4030e55 (diff) | |
parent | 625994b7cc4ebd0bc2652ae80b93386aa4b766ac (diff) | |
download | mariadb-git-65c5ef9b495bac078ad2a502a75801c7cfe5b95a.tar.gz |
dirty merge
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 4c0035b9c48..fdca609f5af 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2008, 2017, MariaDB Corporation +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. + Copyright (c) 2008, 2019, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -571,7 +571,7 @@ bool log_in_use(const char* log_name) if ((linfo = tmp->current_linfo)) { mysql_mutex_lock(&linfo->lock); - result = !memcmp(log_name, linfo->log_file_name, log_name_len); + result = !strncmp(log_name, linfo->log_file_name, log_name_len); mysql_mutex_unlock(&linfo->lock); if (result) break; |