bk commit into 5.0 tree (kaa:1.2314)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-25 17:20:12+03:00, kaa@stripped +2 -0
  Backport fix for Bug 21468 (InnoDB crash during recovery with corrupted data pages: XA bug?), for the 5.0.30-SP1 release.

  innobase/trx/trx0roll.c@stripped, 2006-12-25 17:20:07+03:00, kaa@stripped +19 -1
    Backport fix for Bug 21468 (InnoDB crash during recovery with corrupted data pages: XA bug?), for the 5.0.30-SP1 release.

  innobase/trx/trx0trx.c@stripped, 2006-12-25 17:20:07+03:00, kaa@stripped +18 -0
    Backport fix for Bug 21468 (InnoDB crash during recovery with corrupted data pages: XA bug?), for the 5.0.30-SP1 release.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/mysql-5.0.30-SP1

--- 1.27/innobase/trx/trx0roll.c	2006-12-25 17:20:17 +03:00
+++ 1.28/innobase/trx/trx0roll.c	2006-12-25 17:20:17 +03:00
@@ -129,9 +129,27 @@ trx_rollback_for_mysql(
 	}
 
 	trx->op_info = "rollback";
+
+	/* If we are doing the XA recovery of prepared transactions, then
+	the transaction object does not have an InnoDB session object, and we
+	set a dummy session that we use for all MySQL transactions. */
 	
-	err = trx_general_rollback_for_mysql(trx, FALSE, NULL);
+	mutex_enter(&kernel_mutex);
+
+	if (trx->sess == NULL) {
+		/* Open a dummy session */
+
+		if (!trx_dummy_sess) {
+			trx_dummy_sess = sess_open();
+		}
 
+		trx->sess = trx_dummy_sess;
+	}
+
+	mutex_exit(&kernel_mutex);
+
+	err = trx_general_rollback_for_mysql(trx, FALSE, NULL);
+	
 	trx->op_info = "";
 
 	return(err);

--- 1.63/innobase/trx/trx0trx.c	2006-12-25 17:20:17 +03:00
+++ 1.64/innobase/trx/trx0trx.c	2006-12-25 17:20:17 +03:00
@@ -1601,7 +1601,25 @@ trx_commit_for_mysql(
 	ut_a(trx);
 
 	trx->op_info = "committing";
+
+	/* If we are doing the XA recovery of prepared transactions, then
+	the transaction object does not have an InnoDB session object, and we
+	set the dummy session that we use for all MySQL transactions. */
 	
+	mutex_enter(&kernel_mutex);
+
+	if (trx->sess == NULL) {
+		/* Open a dummy session */
+
+		if (!trx_dummy_sess) {
+			trx_dummy_sess = sess_open();
+		}
+
+		trx->sess = trx_dummy_sess;
+	}
+	
+	mutex_exit(&kernel_mutex);
+
 	trx_start_if_not_started(trx);
 
 	mutex_enter(&kernel_mutex);