branches/zip: Merge revisions 869:887 from trunk.

handler/Makefile.am

@@ -24,3 +24,6 @@ noinst_LIBRARIES =	libhandler.a
 libhandler_a_SOURCES =	ha_innodb.cc
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

handler/ha_innodb.h

@@ -80,7 +80,7 @@ class ha_innobase: public handler
 
 	/* Init values for the class: */
  public:
-	ha_innobase(TABLE_SHARE *table_arg);
+	ha_innobase(handlerton *hton, TABLE_SHARE *table_arg);
 	~ha_innobase() {}
 	/*
 	  Get the row type from the storage engine.  If this method returns
@@ -238,8 +238,8 @@ extern ulong srv_flush_log_at_trx_commit;
 }
 
 int innobase_init(void);
-int innobase_end(ha_panic_function type);
-bool innobase_flush_logs(void);
+int innobase_end(handlerton *hton, ha_panic_function type);
+bool innobase_flush_logs(handlerton *hton);
 uint innobase_get_free_space(void);
 
 /*
@@ -256,14 +256,14 @@ int innobase_commit_complete(void* trx_handle);
 void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset);
 #endif
 
-void innobase_drop_database(char *path);
-bool innobase_show_status(THD* thd, stat_print_fn*, enum ha_stat_type);
+void innobase_drop_database(handlerton *hton, char *path);
+bool innobase_show_status(handlerton *hton, THD* thd, stat_print_fn*, enum ha_stat_type);
 
-int innobase_release_temporary_latches(THD *thd);
+int innobase_release_temporary_latches(handlerton *hton, THD *thd);
 
-void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset);
+void innobase_store_binlog_offset_and_flush_log(handlerton *hton, char *binlog_name,longlong offset);
 
-int innobase_start_trx_and_assign_read_view(THD* thd);
+int innobase_start_trx_and_assign_read_view(handlerton *hton, THD* thd);
 
 /***********************************************************************
 This function is used to prepare X/Open XA distributed transaction   */
@@ -271,6 +271,7 @@ This function is used to prepare X/Open XA distributed transaction   */
 int innobase_xa_prepare(
 /*====================*/
 			/* out: 0 or error number */
+        handlerton *hton, /* in: innobase hton */
 	THD*	thd,	/* in: handle to the MySQL thread of the user
 			whose XA transaction should be prepared */
 	bool	all);	/* in: TRUE - commit transaction
@@ -283,6 +284,7 @@ int innobase_xa_recover(
 /*====================*/
 				/* out: number of prepared transactions
 				stored in xid_list */
+        handlerton *hton, /* in: innobase hton */
 	XID*	xid_list,	/* in/out: prepared transactions */
 	uint	len);		/* in: number of slots in xid_list */
 
@@ -293,6 +295,7 @@ which is in the prepared state */
 int innobase_commit_by_xid(
 /*=======================*/
 			/* out: 0 or error number */
+        handlerton *hton, /* in: innobase hton */
 	XID*	xid);	/* in : X/Open XA Transaction Identification */
 
 /***********************************************************************
@@ -301,6 +304,7 @@ which is in the prepared state */
 
 int innobase_rollback_by_xid(
 			/* out: 0 or error number */
+        handlerton *hton, /* in: innobase hton */
 	XID	*xid);	/* in : X/Open XA Transaction Identification */
 
 
@@ -311,9 +315,10 @@ This consistent view is then used inside of MySQL when accessing records
 using a cursor. */
 
 void*
-innobase_create_cursor_view(void);
-/*=============================*/
+innobase_create_cursor_view(
 			  /* out: Pointer to cursor view or NULL */
+        handlerton *hton, /* in: innobase hton */
+	THD* thd);	  /* in: user thread handle */
 
 /***********************************************************************
 Close the given consistent cursor view of a transaction and restore
@@ -323,8 +328,11 @@ corresponding MySQL thread still lacks one. */
 void
 innobase_close_cursor_view(
 /*=======================*/
+        handlerton *hton, /* in: innobase hton */
+	THD*	thd,		/* in: user thread handle */
 	void*	curview);	/* in: Consistent read view to be closed */
 
+
 /***********************************************************************
 Set the given consistent cursor view to a transaction which is created
 if the corresponding MySQL thread still lacks one. If the given
@@ -334,4 +342,6 @@ restored to a transaction read view. */
 void
 innobase_set_cursor_view(
 /*=====================*/
+        handlerton *hton, /* in: innobase hton */
+	THD*	thd,		/* in: user thread handle */
 	void*	curview);	/* in: Consistent read view to be set */

setup.sh

@@ -3,43 +3,18 @@
 # Prepare the MySQL source code tree for building
 # with checked-out InnoDB Subversion directory.
 
-# This script assumes that the MySQL tree is at .. and that . = ../innodb
+# This script assumes that the current directory is storage/innobase.
 
 set -eu
 
 TARGETDIR=../storage/innobase
 
-rm -fr "$TARGETDIR"
-mkdir "$TARGETDIR"
-
 # link the build scripts
-ln -sf ../innodb/compile-innodb{,-debug} ../BUILD
-
-# create the directories
-for dir in */
-do
-  case "$dir" in
-      mysql-test/) ;;
-      *.svn*) ;;
-      *to-mysql*) ;;
-      *) mkdir "$TARGETDIR/$dir" ;;
-  esac
-done
-
-# create the symlinks to files
-cd "$TARGETDIR"
-for dir in */
-do
-  cd "$dir"
-  ln -s ../../../innodb/"$dir"* .
-  cd ..
-done
-for file in plug.in Makefile.am CMakeLists.txt
-do
-  ln -s ../../innodb/"$file" .
-done
+ln -sf $TARGETDIR/compile-innodb{,-debug} ../../BUILD
 
 cd ../../mysql-test/t
-ln -sf ../../innodb/mysql-test/*.test ../../innodb/mysql-test/*.opt ./
-ln -sf ../../innodb/mysql-test/*.result ../r/
-ln -sf ../../innodb/mysql-test/*.inc ../include/
+ln -sf ../$TARGETDIR/mysql-test/*.test $TARGETDIR/mysql-test/*.opt .
+cd ../r
+ln -sf ../$TARGETDIR/mysql-test/*.result .
+cd ../include
+ln -sf ../$TARGETDIR/mysql-test/*.inc .