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/log.cc | |
| parent | e6fcd7230954c6111bba63e7f7201fc81e50178e (diff) | |
| parent | ad220b96fb01dbb6acf7e51bdd8d4d6362d96ea7 (diff) | |
| download | mariadb-git-a3df9bcadc57be70bdadc8cf21290e4fe6c9b37a.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log.cc b/sql/log.cc index e82d001fefc..6761934caf0 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. + Copyright (c) 2009, 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 @@ -3758,7 +3758,7 @@ int MYSQL_BIN_LOG::find_log_pos(LOG_INFO *linfo, const char *log_name, // if the log entry matches, null string matching anything if (!log_name || (log_name_len == fname_len-1 && full_fname[log_name_len] == '\n' && - !memcmp(full_fname, full_log_name, log_name_len))) + !strncmp(full_fname, full_log_name, log_name_len))) { DBUG_PRINT("info", ("Found log file entry")); full_fname[fname_len-1]= 0; // remove last \n |