bk commit into 5.0 tree (jan:1.1960)

[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.1960 05/07/20 12:20:19 jan@stripped +2 -0
  Allow setting consistent cursor view to NULL. This forces a transaction
  to use normal consistent read view.

  sql/ha_innodb.cc
    1.229 05/07/20 12:20:08 jan@stripped +0 -2
    Allow setting consistent cursor view to NULL. This forces a transaction
    to use normal consistent read view.

  innobase/read/read0read.c
    1.8 05/07/20 12:20:08 jan@stripped +1 -1
    Allow setting consistent cursor view to NULL. This forces a transaction
    to use normal consistent read view.

# 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.7/innobase/read/read0read.c	2005-07-20 09:30:41 +03:00
+++ 1.8/innobase/read/read0read.c	2005-07-20 12:20:08 +03:00
@@ -370,7 +370,7 @@
 	trx_t*		trx,	/* in: transaction where cursor is set */
 	cursor_view_t*	cursor)	/* in: consistent cursor view to be set */
 {
-	ut_a(trx && cursor);
+	ut_a(trx);
 
 	mutex_enter(&kernel_mutex);
 

--- 1.228/sql/ha_innodb.cc	2005-07-20 09:37:15 +03:00
+++ 1.229/sql/ha_innodb.cc	2005-07-20 12:20:08 +03:00
@@ -7178,8 +7178,6 @@
 	THD*		thd;
 	cursor_view_t* 	cursor_view = (cursor_view_t*)cursor;
 
-	ut_a(cursor_view);
-
 	thd = (THD *)innobase_current_thd();
 	trx = check_trx_exists(thd);