bk commit into 5.1 tree (baker:1.2364)

[Brian Aker]

Below is the list of changes that have just been committed into a local
5.1 repository of baker. When baker 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-22 18:04:33+01:00, baker@stripped +3 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
  into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
  MERGE: 1.2343.1.24

  mysql-test/t/disabled.def@stripped, 2006-12-22 18:04:27+01:00, baker@stripped
+0 -0
    Auto merged
    MERGE: 1.220.1.1

  sql/mysqld.cc@stripped, 2006-12-22 18:04:28+01:00, baker@stripped +0 -0
    Auto merged
    MERGE: 1.599.1.2

  storage/innobase/handler/ha_innodb.cc@stripped, 2006-12-22 18:04:28+01:00,
baker@stripped +0 -0
    Auto merged
    MERGE: 1.313.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:	baker
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.1-arch/RESYNC

--- 1.600/sql/mysqld.cc	2006-12-22 18:04:40 +01:00
+++ 1.601/sql/mysqld.cc	2006-12-22 18:04:40 +01:00
@@ -391,6 +391,7 @@
                innobase_use_large_pages,
                innobase_use_native_aio,
                innobase_file_per_table, innobase_locks_unsafe_for_binlog,
+               innobase_rollback_on_timeout,
                innobase_create_status_file;
 extern "C" {
 extern ulong srv_max_buf_pool_modified_pct;
@@ -4873,7 +4874,8 @@
   OPT_PORT_OPEN_TIMEOUT,
   OPT_GENERAL_LOG,
   OPT_SLOW_LOG,
-  OPT_MERGE
+  OPT_MERGE,
+  OPT_INNODB_ROLLBACK_ON_TIMEOUT
 };
 
 
@@ -5166,6 +5168,10 @@
    (gptr*) &srv_max_purge_lag,
    (gptr*) &srv_max_purge_lag, 0, GET_LONG, REQUIRED_ARG, 0, 0, ~0L,
    0, 1L, 0},
+  {"innodb_rollback_on_timeout", OPT_INNODB_ROLLBACK_ON_TIMEOUT,
+   "Roll back the complete transaction on lock wait timeout, for 4.x compatibility
(disabled by default)",
+   (gptr*) &innobase_rollback_on_timeout, (gptr*) &innobase_rollback_on_timeout,
+   0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"innodb_status_file", OPT_INNODB_STATUS_FILE,
    "Enable SHOW INNODB STATUS output in the innodb_status.<pid> file",
    (gptr*) &innobase_create_status_file, (gptr*) &innobase_create_status_file,
@@ -8153,7 +8159,8 @@
         innobase_use_doublewrite,
         innobase_use_checksums,
         innobase_file_per_table,
-        innobase_locks_unsafe_for_binlog;
+        innobase_locks_unsafe_for_binlog,
+        innobase_rollback_on_timeout;
 
 extern "C" {
 ulong srv_max_buf_pool_modified_pct;

--- 1.221/mysql-test/t/disabled.def	2006-12-22 18:04:40 +01:00
+++ 1.222/mysql-test/t/disabled.def	2006-12-22 18:04:40 +01:00
@@ -11,6 +11,7 @@
 ##############################################################################
 user_limits     : Bug#23921 random failure of user_limits.test
 
+im_daemon_life_cycle     : Bug#24415  see note: [19 Dec 23:17] Trudy Pelzer
 im_options                : Bug#20294 2006-07-24 stewart   Instance manager test
im_options fails randomly
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures
with varying differences
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

--- 1.314/storage/innobase/handler/ha_innodb.cc	2006-12-22 18:04:40 +01:00
+++ 1.315/storage/innobase/handler/ha_innodb.cc	2006-12-22 18:04:40 +01:00
@@ -181,6 +181,7 @@
 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;
@@ -473,6 +474,10 @@
 		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) {
@@ -1565,6 +1570,8 @@
 
 	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;