diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-19 16:57:51 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-19 16:57:51 -0700 |
| commit | 47b0a0b08904e900e6b034e32ad124139c9dcb93 (patch) | |
| tree | 9d22a6e3d1f813ebfd932d958ebe02a7a5519099 /sql/ha_innodb.h | |
| parent | 9d8c9e9d96dc85cfac055b6014ac65d867152edf (diff) | |
| download | mariadb-git-47b0a0b08904e900e6b034e32ad124139c9dcb93.tar.gz | |
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.
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index 95d7a9437ad..60bc0e9c7cf 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -216,6 +216,7 @@ extern my_bool innobase_log_archive, 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 my_bool innobase_very_fast_shutdown; /* set this to 1 just before calling innobase_end() if you want |