bzr commit into mysql-trunk-innodb branch (marko.makela:3444)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:marko.makela@strippedm75i1guftugt

 3444 Marko Mäkelä	2011-01-20
      Non-functional change: Remove a goto.

    modified:
      storage/innobase/trx/trx0trx.c
=== modified file 'storage/innobase/trx/trx0trx.c'
--- a/storage/innobase/trx/trx0trx.c	revid:marko.makela@strippeduftugt
+++ b/storage/innobase/trx/trx0trx.c	revid:marko.makela@stripped
@@ -1066,23 +1066,17 @@ trx_commit_for_mysql(
 		/* fall through */
 	case TRX_STATE_ACTIVE:
 	case TRX_STATE_PREPARED:
-		goto state_ok;
+		trx->op_info = "committing";
+		trx_commit(trx);
+		MONITOR_INC(MONITOR_TRX_COMMIT);
+		MONITOR_DEC(MONITOR_TRX_ACTIVE);
+		trx->op_info = "";
+		return(DB_SUCCESS);
 	case TRX_STATE_COMMITTED_IN_MEMORY:
 		break;
 	}
 	ut_error;
-state_ok:
-	trx->op_info = "committing";
-
-	trx_commit(trx);
-
-	MONITOR_INC(MONITOR_TRX_COMMIT);
-
-	MONITOR_DEC(MONITOR_TRX_ACTIVE);
-
-	trx->op_info = "";
-
-	return(DB_SUCCESS);
+	return(DB_CORRUPTION);
 }
 
 /**********************************************************************//**

Attachment: [text/bzr-bundle] bzr/[e-mail]