bk commit into 5.0 tree (jan:1.1989) BUG#12456

[Jan Lindstrom]

Below is the list of changes that have just been committed into a local
5.0 repository of jan. When jan 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
  1.1989 05/08/18 06:38:01 jan@stripped +1 -0
  Allow consistent cursor view see changes made by creating transaction.
  This is quick fix and needs to be fixed when semi-consistent 
  high-granularity read view is implemented (Bug #12456).

  innobase/read/read0read.c
    1.10 05/08/18 06:37:49 jan@stripped +5 -3
    Allow consistent cursor view see changes made by creating transaction.
    This is quick fix and needs to be fixed when semi-consistent 
    high-granularity read view is implemented (Bug #12456).

# 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:	jan
# Host:	hundin.mysql.fi
# Root:	/home/jan/mysql-5.0

--- 1.9/innobase/read/read0read.c	2005-08-10 17:36:02 +03:00
+++ 1.10/innobase/read/read0read.c	2005-08-18 06:37:49 +03:00
@@ -310,11 +310,13 @@
 	n = 0;
 	trx = UT_LIST_GET_FIRST(trx_sys->trx_list);
 
-	/* No active transaction should be visible, not even cr_trx !*/
+	/* No active transaction should be visible, except cr_trx.
+	This is quick fix for a bug 12456 and needs to be fixed when
+	semi-consistent high-granularity read view is implemented. */
 
 	while (trx) {
-                if (trx->conc_state == TRX_ACTIVE ||
-			trx->conc_state == TRX_PREPARED) {
+                if (trx != cr_trx && (trx->conc_state == TRX_ACTIVE ||
+					trx->conc_state == TRX_PREPARED)) {
 
 			read_view_set_nth_trx_id(view, n, trx->id);