List:Commits« Previous MessageNext Message »
From:msvensson Date:September 11 2006 2:40pm
Subject:bk commit into 5.1 tree (msvensson:1.2318)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2006-09-11 16:40:09+02:00, msvensson@shellback.(none) +1 -0
  Merge bk-internal:/home/bk/mysql-5.1
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1
  MERGE: 1.2309.3.2

  storage/innobase/handler/ha_innodb.cc@stripped, 2006-09-11 16:40:06+02:00, msvensson@shellback.(none) +1 -1
    Manual merge
    MERGE: 1.288.1.2

  storage/innobase/handler/ha_innodb.cc@stripped, 2006-09-11 16:33:27+02:00, msvensson@shellback.(none) +0 -0
    Merge rename: sql/ha_innodb.cc -> storage/innobase/handler/ha_innodb.cc

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1/RESYNC

--- 1.288.1.1/sql/ha_innodb.cc	2006-09-11 16:40:15 +02:00
+++ 1.292/storage/innobase/handler/ha_innodb.cc	2006-09-11 16:40:15 +02:00
@@ -31,10 +31,9 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include "mysql_priv.h"
+#include <mysql_priv.h>
 #ifdef WITH_INNOBASE_STORAGE_ENGINE
 
-#include "slave.h"
 
 #include <m_ctype.h>
 #include <hash.h>
@@ -1602,21 +1601,6 @@
 	pthread_cond_init(&commit_cond, NULL);
 	innodb_inited= 1;
 
-	/* If this is a replication slave and we needed to do a crash recovery,
-	set the master binlog position to what InnoDB internally knew about
-	how far we got transactions durable inside InnoDB. There is a
-	problem here: if the user used also MyISAM tables, InnoDB might not
-	know the right position for them.
-
-	THIS DOES NOT WORK CURRENTLY because replication seems to initialize
-	glob_mi also after innobase_init. */
-
-/*	if (trx_sys_mysql_master_log_pos != -1) {
-		ut_memcpy(glob_mi.log_file_name, trx_sys_mysql_master_log_name,
-				1 + ut_strlen(trx_sys_mysql_master_log_name));
-		glob_mi.pos = trx_sys_mysql_master_log_pos;
-	}
-*/
 	DBUG_RETURN(FALSE);
 error:
 	have_innodb= SHOW_OPTION_DISABLED;	// If we couldn't use handler
@@ -1690,19 +1674,6 @@
 
 		return;
 	}
-
-#ifdef HAVE_REPLICATION
-	THD *thd=current_thd;
-
-	if (thd && thd->slave_thread) {
-		/* Update the replication position info inside InnoDB */
-
-		trx->mysql_master_log_file_name
-					= active_mi->rli.group_master_log_name;
-		trx->mysql_master_log_pos = ((ib_longlong)
-				active_mi->rli.future_group_master_log_pos);
-	}
-#endif /* HAVE_REPLICATION */
 
 	trx_commit_for_mysql(trx);
 }
Thread
bk commit into 5.1 tree (msvensson:1.2318)msvensson11 Sep