database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-8931: (server part of) session state tracking

Browse Source 
Transaction tracker
This commit is contained in:
Oleksandr Byelkin
2016-05-30 21:22:50 +02:00
parent c8948b0d0d
commit 0ee3e64c55
32 changed files with 1173 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sql/sql_cache.cc
View File

@ -1381,6 +1381,21 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
DBUG_VOID_RETURN;
}
/*
Do not store queries while tracking transaction state.
The tracker already flags queries that actually have
transaction tracker items, but this will make behavior
more straight forward.
*/
#ifndef EMBEDDED_LIBRARY
if (thd->variables.session_track_transaction_info != TX_TRACK_NONE)
{
DBUG_PRINT("qcache", ("Do not work with transaction tracking"));
DBUG_VOID_RETURN;
}
#endif //EMBEDDED_LIBRARY
/* The following assert fails if we haven't called send_result_to_client */
DBUG_ASSERT(thd->base_query.is_alloced() ||
thd->base_query.ptr() == thd->query());
@ -1719,6 +1734,20 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
goto err;
}
/*
Don't allow serving from Query_cache while tracking transaction
state. This is a safeguard in case an otherwise matching query
was added to the cache before tracking was turned on.
*/
#ifndef EMBEDDED_LIBRARY
if (thd->variables.session_track_transaction_info != TX_TRACK_NONE)
{
DBUG_PRINT("qcache", ("Do not work with transaction tracking"));
goto err;
}
#endif //EMBEDDED_LIBRARY
thd->query_cache_is_applicable= 1;
sql= org_sql; sql_end= sql + query_length;