database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

refs codership/galera#308

Browse Source 
- Moves cleanup of status vars to function export_wsrep_status_to_mysql().
This commit is contained in:
Daniele Sciascia
2015-10-16 10:22:30 +02:00
committed by Nirbhay Choubey
parent 2c56142b77
commit 8c89e843db
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@@ -2361,10 +2361,6 @@ void THD::cleanup_after_query()
rgi_slave->cleanup_after_query(); rgi_slave->cleanup_after_query();
#endif #endif
#ifdef WITH_WSREP
wsrep_free_status(this);
#endif /* WITH_WSREP */
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

5
sql/wsrep_var.cc
View File

@@ -567,6 +567,11 @@ static void export_wsrep_status_to_mysql(THD* thd)
{ {
int wsrep_status_len, i; int wsrep_status_len, i;
if (thd->wsrep_status_vars)
{
wsrep->stats_free(wsrep, thd->wsrep_status_vars);
}
thd->wsrep_status_vars = wsrep->stats_get(wsrep); thd->wsrep_status_vars = wsrep->stats_get(wsrep);
if (!thd->wsrep_status_vars) { if (!thd->wsrep_status_vars) {