From 3d1af939c30355fb835010be2a8a4de620b2b9a9 Mon Sep 17 00:00:00 2001 From: Konstantin Osipov Date: Thu, 29 Jul 2010 12:35:12 +0400 Subject: [PATCH] Fix a Windows failure of main.merge test introduced by the precursor patch for Bug#52044. When passing the TABLE instance for invalidation to the query cache, we didn't always have a valid share (in case of error). Make sure we invalidate the table using TABLE_LIST, not TABLE, object. --- sql/sql_table.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_table.cc b/sql/sql_table.cc index c4b4a37b35a..0447e1a24af 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5144,7 +5144,8 @@ send_result_message: May be something modified. Consequently, we have to invalidate the query cache. */ - query_cache_invalidate3(thd, table->table, 0); + table->table= 0; // For query cache + query_cache_invalidate3(thd, table, 0); } } /* Error path, a admin command failed. */ @@ -5152,7 +5153,6 @@ send_result_message: trans_commit_implicit(thd); close_thread_tables(thd); thd->mdl_context.release_transactional_locks(); - table->table=0; // For query cache /* If it is CHECK TABLE v1, v2, v3, and v1, v2, v3 are views, we will run