bk commit into 5.0 tree (heikki:1.1996) BUG#3300

[Heikki Tuuri]

Below is the list of changes that have just been committed into a local
5.0 repository of heikki. When heikki 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.1996 05/07/01 22:53:08 heikki@stripped +3 -0
  trx0trx.h, trx0trx.ic, row0mysql.c:
    Fix another bug in the fix of Bug #3300

  innobase/include/trx0trx.h
    1.50 05/07/01 22:52:49 heikki@stripped +2 -2
    Fix another bug in the fix of Bug #3300

  innobase/include/trx0trx.ic
    1.5 05/07/01 22:52:45 heikki@stripped +2 -2
    Fix another bug in the fix of Bug #3300

  innobase/row/row0mysql.c
    1.111 05/07/01 22:52:31 heikki@stripped +1 -1
    Fix another bug in the fix of Bug #3300

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

--- 1.49/innobase/include/trx0trx.h	Fri Jul  1 21:03:57 2005
+++ 1.50/innobase/include/trx0trx.h	Fri Jul  1 22:52:49 2005
@@ -29,8 +29,8 @@
 /*========================*/
 	trx_t*	trx);	/* in: transaction struct */
 /*****************************************************************
-Registers that we have set a new record lock on an index. We only have
-space to store 2 indexes! If this is called more than twice after
+Registers that we have set a new record lock on an index. We only have space
+to store 2 indexes! If this is called to store more than 2 indexes after
 trx_reset_new_rec_lock_info(), then this function does nothing. */
 UNIV_INLINE
 void

--- 1.4/innobase/include/trx0trx.ic	Fri Jul  1 21:04:01 2005
+++ 1.5/innobase/include/trx0trx.ic	Fri Jul  1 22:52:45 2005
@@ -52,8 +52,8 @@
 }
 
 /*****************************************************************
-Registers that we have set a new record lock on an index. We only have
-space to store 2 indexes! If this is called more than twice after
+Registers that we have set a new record lock on an index. We only have space
+to store 2 indexes! If this is called to store more than 2 indexes after
 trx_reset_new_rec_lock_info(), then this function does nothing. */
 UNIV_INLINE
 void

--- 1.110/innobase/row/row0mysql.c	Fri Jul  1 20:41:27 2005
+++ 1.111/innobase/row/row0mysql.c	Fri Jul  1 22:52:31 2005
@@ -1517,7 +1517,7 @@
 									&mtr);
 		}
 
-		rec = btr_pcur_get_rec(pcur);
+		rec = btr_pcur_get_rec(clust_pcur);
 
 		mutex_enter(&kernel_mutex);