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 
- Avoid calling wsrep->stats_free() directly, instead, use wsrep_free_status().
This commit is contained in:
Daniele Sciascia
2015-10-16 11:51:11 +02:00
committed by Nirbhay Choubey
parent 8c89e843db
commit cf43620136
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@@ -1837,7 +1837,7 @@ THD::~THD()
mysql_mutex_unlock(&LOCK_wsrep_thd); mysql_mutex_unlock(&LOCK_wsrep_thd);
mysql_mutex_destroy(&LOCK_wsrep_thd); mysql_mutex_destroy(&LOCK_wsrep_thd);
if (wsrep_rgi) delete wsrep_rgi; if (wsrep_rgi) delete wsrep_rgi;
if (wsrep_status_vars) wsrep->stats_free(wsrep, wsrep_status_vars); wsrep_free_status(this);
#endif #endif
/* Close connection */ /* Close connection */
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY

5
sql/wsrep_var.cc
View File

@@ -567,10 +567,7 @@ 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_free_status(thd);
{
wsrep->stats_free(wsrep, thd->wsrep_status_vars);
}
thd->wsrep_status_vars = wsrep->stats_get(wsrep); thd->wsrep_status_vars = wsrep->stats_get(wsrep);