diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-20 17:11:47 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-20 17:11:47 -0700 |
| commit | 8b855aecad88b3a653827d5a12e511b74c3fd413 (patch) | |
| tree | 9021afd6d2448b97d28eae4c2c74aa27345b6493 /sql/set_var.cc | |
| parent | 9639b35ab514bb03d4f39f0924998752bbe948a2 (diff) | |
| download | mariadb-git-8b855aecad88b3a653827d5a12e511b74c3fd413.tar.gz | |
Post-merge fix (related to bug 24200 changes)
sql/mysqld.cc:
Post-merge fix
sql/set_var.cc:
Post-merge fix
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 728aefd6428..64d46b1fc30 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -78,7 +78,8 @@ extern my_bool innobase_log_archive, 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" { extern ulong srv_max_buf_pool_modified_pct; |