1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a Windows failure of main.merge test introduced by

Browse Source 
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.
This commit is contained in:
Konstantin Osipov 2010-07-29 12:35:12 +04:00
parent 0b217d9015
commit 3d1af939c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@ -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