diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 10:36:12 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 10:36:12 +0100 |
| commit | a3df9bcadc57be70bdadc8cf21290e4fe6c9b37a (patch) | |
| tree | 630daf21227a6fcd6466f65d70f5809928e2c8b2 /sql/sql_repl.cc | |
| parent | e6fcd7230954c6111bba63e7f7201fc81e50178e (diff) | |
| parent | ad220b96fb01dbb6acf7e51bdd8d4d6362d96ea7 (diff) | |
| download | mariadb-git-a3df9bcadc57be70bdadc8cf21290e4fe6c9b37a.tar.gz | |
Merge branch '5.5' into 10.0
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 a2acf52d44e..29ca2dccb07 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 @@ -481,7 +481,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; |