1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Automatic merge

This commit is contained in:
Michael Widenius
2010-10-01 18:27:32 +03:00
43 changed files with 186 additions and 167 deletions

View File

@@ -740,7 +740,7 @@ inline void Query_cache_query::lock_writing()
remove it.
*/
my_bool Query_cache_query::try_lock_writing()
bool Query_cache_query::try_lock_writing()
{
DBUG_ENTER("Query_cache_block::try_lock_writing");
if (rw_trywrlock(&lock)!=0)