refs codership/galera#308

Daniele Sciascia · Nirbhay Choubey · commit 8c89e843db9e · 2016-02-22T16:38:32.000-05:00
- Moves cleanup of status vars to function export_wsrep_status_to_mysql().
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
@@ -2361,10 +2361,6 @@ void THD::cleanup_after_query()
     rgi_slave->cleanup_after_query();
 #endif
 
-#ifdef WITH_WSREP
-  wsrep_free_status(this);
-#endif /* WITH_WSREP */
-
   DBUG_VOID_RETURN;
 }
 
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
@@ -567,6 +567,11 @@ static void export_wsrep_status_to_mysql(THD* thd)
 {
   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);
 
   if (!thd->wsrep_status_vars) {

Original file line number	Diff line number	Diff line change
`@@ -2361,10 +2361,6 @@ void THD::cleanup_after_query()`
`2361`	`2361`	`rgi_slave->cleanup_after_query();`
`2362`	`2362`	`#endif`
`2363`	`2363`
`2364`		`-#ifdef WITH_WSREP`
`2365`		`- wsrep_free_status(this);`
`2366`		`-#endif /* WITH_WSREP */`
`2367`		`-`
`2368`	`2364`	`DBUG_VOID_RETURN;`
`2369`	`2365`	`}`
`2370`	`2366`