From: Date: December 20 2006 1:46am
Subject: bk commit into 5.0 tree (tsmith:1.2356)
List-Archive: http://lists.mysql.com/commits/17191
Message-Id: <20061220004635.763F25CCE@siva.hindu.god>

Below is the list of changes that have just been committed into a local
5.0 repository of tim. When tim 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-12-19 17:46:28-07:00, tsmith@stripped +1 -0
  Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
  into  siva.hindu.god:/usr/home/tim/m/bk/50-build
  MERGE: 1.2348.2.2

  sql/ha_innodb.cc@stripped, 2006-12-19 17:46:23-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.304.1.2

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/50-build/RESYNC

--- 1.305/sql/ha_innodb.cc	2006-12-19 17:46:35 -07:00
+++ 1.306/sql/ha_innodb.cc	2006-12-19 17:46:35 -07:00
@@ -173,6 +173,7 @@ my_bool innobase_use_large_pages    = FA
 my_bool	innobase_use_native_aio			= FALSE;
 my_bool	innobase_file_per_table			= FALSE;
 my_bool innobase_locks_unsafe_for_binlog        = FALSE;
+my_bool innobase_rollback_on_timeout		= FALSE;
 my_bool innobase_create_status_file		= FALSE;
 
 static char *internal_innobase_data_file_path	= NULL;
@@ -467,6 +468,10 @@ convert_error_code_to_mysql(
 		latest SQL statement in a lock wait timeout. Previously, we
 		rolled back the whole transaction. */
 
+		if (thd && row_rollback_on_timeout) {
+			ha_rollback(thd);
+		}
+
    		return(HA_ERR_LOCK_WAIT_TIMEOUT);
 
  	} else if (error == (int) DB_NO_REFERENCED_ROW) {
@@ -1379,6 +1384,8 @@ innobase_init(void)
 
 	os_use_large_pages = (ibool) innobase_use_large_pages;
 	os_large_page_size = (ulint) innobase_large_page_size;
+
+	row_rollback_on_timeout = (ibool) innobase_rollback_on_timeout;
 
 	srv_file_per_table = (ibool) innobase_file_per_table;
         srv_locks_unsafe_for_binlog = (ibool) innobase_locks_unsafe_for_binlog;