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/set_var.cc | |
| 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/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 23afef742a6..5bbab6224ef 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -904,6 +904,7 @@ struct show_var_st init_vars[]= { {sys_innodb_max_purge_lag.name, (char*) &sys_innodb_max_purge_lag, SHOW_SYS}, {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG}, {"innodb_open_files", (char*) &innobase_open_files, SHOW_LONG }, + {"innodb_rollback_on_timeout", (char*) &innobase_rollback_on_timeout, SHOW_MY_BOOL}, {sys_innodb_support_xa.name, (char*) &sys_innodb_support_xa, SHOW_SYS}, {sys_innodb_sync_spin_loops.name, (char*) &sys_innodb_sync_spin_loops, SHOW_SYS}, {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS}, |