bk commit into 5.0 tree (jan:1.1963)

[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.1963 05/07/20 09:37:30 jan@stripped +2 -0
  Merge jlindstrom@stripped:/home/bk/mysql-5.0
  into  hundin.mysql.fi:/home/jan/mysql-5.0

  sql/ha_innodb.h
    1.98 05/07/20 09:37:15 jan@stripped +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.228 05/07/20 09:37:15 jan@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.227/sql/ha_innodb.cc	2005-07-19 21:21:01 +03:00
+++ 1.228/sql/ha_innodb.cc	2005-07-20 09:37:15 +03:00
@@ -129,6 +129,7 @@
 #include "../innobase/include/sync0sync.h"
 #include "../innobase/include/fil0fil.h"
 #include "../innobase/include/trx0xa.h"
+#include "../innobase/include/read0read.h"
 }
 
 #define HA_INNOBASE_ROWS_IN_TABLE 10000 /* to get optimization right */
@@ -7131,6 +7132,58 @@
 	} else {
 		return(XAER_NOTA);
 	}
+}
+
+/***********************************************************************
+This function creates an consistent cursor view. */
+
+void*
+innobase_create_cursor_view(void)
+/*=============================*/
+			/* out: Pointer to cursor view or NULL */
+{
+	THD*	thd;
+        trx_t* 	trx;
+
+	thd = (THD *)innobase_current_thd();
+	trx = check_trx_exists(thd);
+
+	return((void *)read_cursor_view_create_for_mysql(trx));
+}
+
+/***********************************************************************
+This function closes the consistent cursor view */
+
+void
+innobase_close_cursor_view(
+/*=======================*/
+	void*	cursor)	/* in: Consistent read view to be closed */
+{
+	cursor_view_t* cursor_view = (cursor_view_t*)cursor;
+
+	ut_a(cursor_view);
+
+	read_cursor_view_close_for_mysql(cursor_view);
+}
+
+/***********************************************************************
+This function sets the consistent cursor view to a transaction */
+
+void
+innobase_set_cursor_view(
+/*=====================*/
+	void*	cursor)	/* in: Consistent cursor view to be closed */
+{
+	trx_t*		trx;
+	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);
+
+	read_cursor_set_for_mysql(trx, cursor_view);
 }
 
 #endif /* HAVE_INNOBASE_DB */

--- 1.97/sql/ha_innodb.h	2005-07-19 21:21:01 +03:00
+++ 1.98/sql/ha_innodb.h	2005-07-20 09:37:15 +03:00
@@ -310,3 +310,27 @@
 
 int innobase_repl_report_sent_binlog(THD *thd, char *log_file_name,
                                my_off_t end_offset);
+
+/***********************************************************************
+This function creates an consistent cursor view. */
+
+void*
+innobase_create_cursor_view(void);
+/*=============================*/
+			/* out: Pointer to cursor view or NULL */
+
+/***********************************************************************
+This function closes the consistent cursor view */
+
+void
+innobase_close_cursor_view(
+/*=======================*/
+	void*	cursor);/* in: Consistent read view to be closed */
+
+/***********************************************************************
+This function sets the consistent cursor view to a transaction */
+
+void
+innobase_set_cursor_view(
+/*=====================*/
+	void*	cursor);/* in: Consistent read view to be closed */