From a2a2e32c02643a0cec111511220227703fda1cd5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2024 20:15:00 +0200 Subject: Merging upstream version 1:11.4.2. Signed-off-by: Daniel Baumann --- sql/sql_cache.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/sql_cache.cc') diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 34d063fc..d3fbd034 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -2351,13 +2351,13 @@ void Query_cache::invalidate(THD *thd, const char *key, size_t key_length, Remove all cached queries that uses the given database. */ -void Query_cache::invalidate(THD *thd, const char *db) +void Query_cache::invalidate(THD *thd, const LEX_CSTRING &db) { DBUG_ENTER("Query_cache::invalidate (db)"); if (is_disabled()) DBUG_VOID_RETURN; - DBUG_SLOW_ASSERT(ok_for_lower_case_names(db)); + DBUG_SLOW_ASSERT(Lex_ident_fs(db).ok_for_lower_case_names()); bool restart= FALSE; /* @@ -2377,7 +2377,7 @@ void Query_cache::invalidate(THD *thd, const char *db) { Query_cache_block *next= table_block->next; Query_cache_table *table = table_block->table(); - if (strcmp(table->db(),db) == 0) + if (strcmp(table->db(), db.str) == 0) { Query_cache_block_table *list_root= table_block->table(0); invalidate_query_block_list(list_root); -- cgit v1.2.3