summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-05-02 17:23:36 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-05-02 17:23:36 +0200
commitb85aa20065504bdda4bc03c2bd7eb7de38865c5d (patch)
tree95bfad29754c859353d513502a621918f2b29048 /sql
parent8cda7ab6a211380d8c6d297181bca32b04f08ed7 (diff)
parentaba911542641c93553bad0307021983998042d69 (diff)
downloadmariadb-git-b85aa20065504bdda4bc03c2bd7eb7de38865c5d.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_base.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 3a7ffdb656a..39d7e157803 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -9216,8 +9216,7 @@ my_bool mysql_rm_tmp_tables(void)
{
file=dirp->dir_entry+idx;
- if (!memcmp(file->name, tmp_file_prefix,
- tmp_file_prefix_length))
+ if (!strncmp(file->name, tmp_file_prefix, tmp_file_prefix_length))
{
char *ext= fn_ext(file->name);
uint ext_len= strlen(ext);