From 47b0a0b08904e900e6b034e32ad124139c9dcb93 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Dec 2006 16:57:51 -0700 Subject: Added innodb_rollback_on_timeout option to restore the 4.1 InnoDB timeout behavior (Bug #24200) mysql-test/t/innodb_mysql-master.opt: Set --innodb-lock-wait-timeout=2, since test for bug #24200 times out. This *could* cause random test failures if some long-running transaction concurrency is being tested. However, such a test really should go in innodb-big or some other test file. --- innobase/include/row0mysql.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'innobase/include') diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index 7d8740db044..9e28fabe491 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -19,6 +19,8 @@ Created 9/17/2000 Heikki Tuuri #include "btr0pcur.h" #include "trx0types.h" +extern ibool row_rollback_on_timeout; + typedef struct row_prebuilt_struct row_prebuilt_t; /*********************************************************************** -- cgit v1.2.1