summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-02-05 12:48:02 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-02-05 12:48:02 +0200
commite80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (patch)
tree0716fe20a806adbe55581d9e996f29dcb3a5ab0b /sql/sql_db.cc
parent7075d7fce626ee915c9ae9308cfb4a8120e83e44 (diff)
parentab2458c61fab2d8e6ead63577af434738874f1cf (diff)
downloadmariadb-git-e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index fbb62bd384a..fcf07f7f920 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -1089,8 +1089,12 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp,
table_list->table_name= *table;
table_list->open_type= OT_BASE_ONLY;
- /* To be able to correctly look up the table in the table cache. */
- if (lower_case_table_names)
+ /*
+ On the case-insensitive file systems table is opened
+ with the lowercased file name. So we should lowercase
+ as well to look up the cache properly.
+ */
+ if (lower_case_file_system)
table_list->table_name.length= my_casedn_str(files_charset_info,
(char*) table_list->table_name.str);