refs codership/galera#308

- Avoid calling wsrep->stats_free() directly, instead, use wsrep_free_status().

refs codership/galera#308
- Avoid calling wsrep->stats_free() directly, instead, use wsrep_free_status().
cf436201 · Daniele Sciascia · Nirbhay Choubey · 8c89e843 · cf436201 · cf436201
Commit cf436201 authored Oct 16, 2015 by Daniele Sciascia Committed by Nirbhay Choubey Feb 22, 2016
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

sql/sql_class.cc sql/sql_class.cc +1 -1

sql/wsrep_var.cc sql/wsrep_var.cc +1 -4

No files found.
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1837,7 +1837,7 @@ THD::~THD()
  mysql_mutex_unlock(&LOCK_wsrep_thd);
  mysql_mutex_destroy(&LOCK_wsrep_thd);
  if (wsrep_rgi) delete wsrep_rgi;
-  if (wsrep_status_vars) wsrep->stats_free(wsrep, wsrep_status_vars);
+  wsrep_free_status(this);
 #endif
  /* Close connection */
 #ifndef EMBEDDED_LIBRARY

--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.cc
@@ -567,10 +567,7 @@ static void export_wsrep_status_to_mysql(THD* thd)
 {
  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);