3 files changed, 23 insertions, 24 deletions

diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
index fafdda16429..82c0abb809f 100644
--- a/storage/innobase/fts/fts0fts.cc
+++ b/storage/innobase/fts/fts0fts.cc
@@ -532,7 +532,7 @@ cleanup:
 	}
 
 	que_graph_free(graph);
-	trx_free(trx);
+	trx->free();
 	ret = true;
 	goto cleanup;
 }
@@ -2724,7 +2724,7 @@ func_exit:
 		}
 	}
 
-	trx_free(trx);
+	trx->free();
 
 	return(error);
 }
@@ -2799,7 +2799,7 @@ fts_update_sync_doc_id(
 
 			fts_sql_rollback(trx);
 		}
-		trx_free(trx);
+		trx->free();
 	}
 
 	return(error);
@@ -3029,7 +3029,7 @@ fts_commit_table(
 
 	fts_sql_commit(trx);
 
-	trx_free(trx);
+	trx->free();
 
 	return(error);
 }
@@ -3794,7 +3794,7 @@ fts_doc_fetch_by_doc_id(
 
 	error = fts_eval_sql(trx, graph);
 	fts_sql_commit(trx);
-	trx_free(trx);
+	trx->free();
 
 	if (!get_doc) {
 		fts_que_graph_free(graph);
@@ -4187,9 +4187,9 @@ fts_sync_commit(
 			<< " ins/sec";
 	}
 
-	/* Avoid assertion in trx_free(). */
+	/* Avoid assertion in trx_t::free(). */
 	trx->dict_operation_lock_mode = 0;
-	trx_free(trx);
+	trx->free();
 
 	return(error);
 }
@@ -4241,9 +4241,9 @@ fts_sync_rollback(
 
 	fts_sql_rollback(trx);
 
-	/* Avoid assertion in trx_free(). */
+	/* Avoid assertion in trx_t::free(). */
 	trx->dict_operation_lock_mode = 0;
-	trx_free(trx);
+	trx->free();
 }
 
 /** Run SYNC on the table, i.e., write out data from the cache to the
@@ -4955,7 +4955,7 @@ fts_get_rows_count(
 
 	fts_que_graph_free(graph);
 
-	trx_free(trx);
+	trx->free();
 
 	return(count);
 }
@@ -4981,7 +4981,7 @@ fts_update_max_cache_size(
 
 	fts_sql_commit(trx);
 
-	trx_free(trx);
+	trx->free();
 }
 #endif /* FTS_CACHE_SIZE_DEBUG */
 
@@ -6169,14 +6169,12 @@ fts_rename_aux_tables_to_hex_format_low(
 					<< table->name << ". Please revert"
 					" manually.";
 				fts_sql_rollback(trx_bg);
-				trx_free(trx_bg);
 				/* Continue to clear aux tables' flags2 */
 				not_rename = true;
-				continue;
+			} else {
+				fts_sql_commit(trx_bg);
 			}
-
-			fts_sql_commit(trx_bg);
-			trx_free(trx_bg);
+			trx_bg->free();
 		}
 
 		DICT_TF2_FLAG_UNSET(parent_table, DICT_TF2_FTS_AUX_HEX_NAME);
@@ -6418,12 +6416,12 @@ fts_rename_aux_tables_to_hex_format(
 		fts_parent_all_index_set_corrupt(trx_corrupt, parent_table);
 		trx_corrupt->dict_operation_lock_mode = 0;
 		fts_sql_commit(trx_corrupt);
-		trx_free(trx_corrupt);
+		trx_corrupt->free();
 	} else {
 		fts_sql_commit(trx_rename);
 	}
 
-	trx_free(trx_rename);
+	trx_rename->free();
 	ib_vector_reset(aux_tables);
 }
 
@@ -6502,7 +6500,7 @@ fts_drop_obsolete_aux_table_from_vector(
 			fts_sql_commit(trx_drop);
 		}
 
-		trx_free(trx_drop);
+		trx_drop->free();
 	}
 }
 
@@ -6996,7 +6994,7 @@ fts_drop_orphaned_tables(void)
 
 	row_mysql_unlock_data_dictionary(trx);
 
-	trx_free(trx);
+	trx->free();
 
 	if (heap != NULL) {
 		mem_heap_free(heap);
@@ -7173,7 +7171,7 @@ cleanup:
 			fts_sql_rollback(trx);
 		}
 
-		trx_free(trx);
+		trx->free();
 	}
 
 	if (!cache->stopword_info.cached_stopword) {
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc
index 487e3d5b419..a14481345f6 100644
--- a/storage/innobase/fts/fts0opt.cc
+++ b/storage/innobase/fts/fts0opt.cc
@@ -1008,7 +1008,7 @@ fts_table_fetch_doc_ids(
 	}
 
 	if (alloc_bk_trx) {
-		trx_free(trx);
+		trx->free();
 	}
 
 	return(error);
@@ -1710,7 +1710,8 @@ fts_optimize_free(
 	mem_heap_t*	heap = static_cast<mem_heap_t*>(optim->self_heap->arg);
 
 	trx_commit_for_mysql(optim->trx);
-	trx_free(optim->trx);
+	optim->trx->free();
+	optim->trx = NULL;
 
 	fts_doc_ids_free(optim->to_delete);
 	fts_optimize_graph_free(&optim->graph);
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc
index 9a4e7c1f486..f3ba0c60c52 100644
--- a/storage/innobase/fts/fts0que.cc
+++ b/storage/innobase/fts/fts0que.cc
@@ -4121,7 +4121,7 @@ fts_query(
 func_exit:
 	fts_query_free(&query);
 
-	trx_free(query_trx);
+	query_trx->free();
 
 	return(error);
 }