From 556f058ab27721658bdeb86f6d8f2dd30d873b64 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 28 Sep 2018 18:04:26 +0200
Subject: ASAN error when strlen(db) < 6
---
sql/table.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'sql/table.cc')
diff --git a/sql/table.cc b/sql/table.cc
index 7ec2a22cbbb..4b2c88cc0e9 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -324,7 +324,8 @@ TABLE_SHARE *alloc_table_share(const char *db, const char *table_name,
share->can_do_row_logging= 1;
if (share->table_category == TABLE_CATEGORY_LOG)
share->no_replicate= 1;
- if (my_strnncoll(table_alias_charset, (uchar*) db, 6,
+ if (key_length > 6 &&
+ my_strnncoll(table_alias_charset, (const uchar*) key, 6,
(const uchar*) "mysql", 6) == 0)
share->not_usable_by_query_cache= 1;
--
cgit v1.2.1