Post-merge fix (related to bug 24200 changes)

c2de802e · tsmith/tim@siva.hindu.god · ab4c0f3b · c2de802e · c2de802e
Commit c2de802e authored Dec 20, 2006 by tsmith/tim@siva.hindu.god
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

sql/mysqld.cc sql/mysqld.cc +3 -1

sql/set_var.cc sql/set_var.cc +2 -1

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -391,6 +391,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 "C" {
 extern ulong srv_max_buf_pool_modified_pct;
@@ -8154,7 +8155,8 @@ 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" {
 ulong srv_max_buf_pool_modified_pct;

--- 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;