bzr commit into mysql-5.1-bugteam branch (svoj:3495)

[Sergey Vojtovich]

#At file:///home/svoj/devel/innodb-snapshots/mysql-5.1-bugteam/ based on revid:svoj@stripped

 3495 Sergey Vojtovich	2010-04-01
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
      branches/zip: Introduce thr_is_recv().

    modified:
      storage/innodb_plugin/include/que0que.h
      storage/innodb_plugin/include/que0que.ic
      storage/innodb_plugin/row/row0umod.c
=== modified file 'storage/innodb_plugin/include/que0que.h'
--- a/storage/innodb_plugin/include/que0que.h	2009-07-30 12:42:56 +0000
+++ b/storage/innodb_plugin/include/que0que.h	2010-04-01 11:51:48 +0000
@@ -30,6 +30,7 @@ Created 5/27/1996 Heikki Tuuri
 #include "data0data.h"
 #include "dict0types.h"
 #include "trx0trx.h"
+#include "trx0roll.h"
 #include "srv0srv.h"
 #include "usr0types.h"
 #include "que0types.h"
@@ -215,6 +216,16 @@ trx_t*
 thr_get_trx(
 /*========*/
 	que_thr_t*	thr);	/*!< in: query thread */
+/*******************************************************************//**
+Determines if this thread is rolling back an incomplete transaction
+in crash recovery.
+@return TRUE if thr is rolling back an incomplete transaction in crash
+recovery */
+UNIV_INLINE
+ibool
+thr_is_recv(
+/*========*/
+	const que_thr_t*	thr);	/*!< in: query thread */
 /***********************************************************************//**
 Gets the type of a graph node. */
 UNIV_INLINE

=== modified file 'storage/innodb_plugin/include/que0que.ic'
--- a/storage/innodb_plugin/include/que0que.ic	2009-05-27 09:45:59 +0000
+++ b/storage/innodb_plugin/include/que0que.ic	2010-04-01 11:51:48 +0000
@@ -38,6 +38,20 @@ thr_get_trx(
 	return(thr->graph->trx);
 }
 
+/*******************************************************************//**
+Determines if this thread is rolling back an incomplete transaction
+in crash recovery.
+@return TRUE if thr is rolling back an incomplete transaction in crash
+recovery */
+UNIV_INLINE
+ibool
+thr_is_recv(
+/*========*/
+	const que_thr_t*	thr)	/*!< in: query thread */
+{
+	return(trx_is_recv(thr->graph->trx));
+}
+
 /***********************************************************************//**
 Gets the first thr in a fork. */
 UNIV_INLINE

=== modified file 'storage/innodb_plugin/row/row0umod.c'
--- a/storage/innodb_plugin/row/row0umod.c	2010-04-01 11:51:26 +0000
+++ b/storage/innodb_plugin/row/row0umod.c	2010-04-01 11:51:48 +0000
@@ -559,7 +559,7 @@ row_undo_mod_upd_del_sec(
 			does not exist.  However, this situation may
 			only occur during the rollback of incomplete
 			transactions. */
-			ut_a(trx_is_recv(thr_get_trx(thr)));
+			ut_a(thr_is_recv(thr));
 		} else {
 			err = row_undo_mod_del_mark_or_remove_sec(
 				node, thr, index, entry);


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