1 files changed, 1 insertions, 32 deletions

diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
index 5c2258f25be..a5be54b7b79 100644
--- a/storage/innobase/trx/trx0roll.cc
+++ b/storage/innobase/trx/trx0roll.cc
@@ -183,10 +183,7 @@ trx_rollback_for_mysql_low(
 /** Rollback a transaction used in MySQL
 @param[in, out]	trx	transaction
 @return error code or DB_SUCCESS */
-static
-dberr_t
-trx_rollback_low(
-	trx_t*	trx)
+dberr_t trx_rollback_for_mysql(trx_t* trx)
 {
 	/* We are reading trx->state without holding trx_sys->mutex
 	here, because the rollback should be invoked for a running
@@ -194,7 +191,6 @@ trx_rollback_low(
 	that is associated with the current thread. */
 
 	switch (trx->state) {
-	case TRX_STATE_FORCED_ROLLBACK:
 	case TRX_STATE_NOT_STARTED:
 		trx->will_lock = 0;
 		ut_ad(trx->in_mysql_trx_list);
@@ -262,28 +258,6 @@ trx_rollback_low(
 }
 
 /*******************************************************************//**
-Rollback a transaction used in MySQL.
-@return error code or DB_SUCCESS */
-dberr_t
-trx_rollback_for_mysql(
-/*===================*/
-	trx_t*	trx)	/*!< in/out: transaction */
-{
-	/* Avoid the tracking of async rollback killer
-	thread to enter into InnoDB. */
-	if (TrxInInnoDB::is_async_rollback(trx)) {
-
-		return(trx_rollback_low(trx));
-
-	} else {
-
-		TrxInInnoDB	trx_in_innodb(trx, true);
-
-		return(trx_rollback_low(trx));
-	}
-}
-
-/*******************************************************************//**
 Rollback the latest SQL statement for MySQL.
 @return error code or DB_SUCCESS */
 dberr_t
@@ -300,7 +274,6 @@ trx_rollback_last_sql_stat_for_mysql(
 	ut_ad(trx->in_mysql_trx_list);
 
 	switch (trx->state) {
-	case TRX_STATE_FORCED_ROLLBACK:
 	case TRX_STATE_NOT_STARTED:
 		return(DB_SUCCESS);
 
@@ -487,12 +460,9 @@ trx_rollback_to_savepoint_for_mysql(
 
 	switch (trx->state) {
 	case TRX_STATE_NOT_STARTED:
-	case TRX_STATE_FORCED_ROLLBACK:
-
 		ib::error() << "Transaction has a savepoint "
 			<< savep->name
 			<< " though it is not started";
-
 		return(DB_ERROR);
 
 	case TRX_STATE_ACTIVE:
@@ -780,7 +750,6 @@ fake_prepared:
 	case TRX_STATE_PREPARED:
 		goto func_exit;
 	case TRX_STATE_NOT_STARTED:
-	case TRX_STATE_FORCED_ROLLBACK:
 		break;
 	}