summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-01-18 15:02:03 +0300
committerunknown <aivanov@mysql.com>2006-01-18 15:02:03 +0300
commit74f499faded76c73f68167cae30e8e0a927d96c7 (patch)
treea6ad6903648d640413b3687a0463715e3997be7e /sql/mysqld.cc
parent596666f74a83e989edb712eab9949d2a13c08fac (diff)
downloadmariadb-git-74f499faded76c73f68167cae30e8e0a927d96c7.tar.gz
Applied patch recieved from Marko:
Make innodb_flush_log_at_trx_commit a settable global variable. innobase/include/srv0srv.h: Change the type of srv_flush_log_at_trx_commit. innobase/srv/srv0srv.c: Change the type of srv_flush_log_at_trx_commit. sql/ha_innodb.cc: Remove innobase_flush_log_at_trx_commit. (Set srv_flush_log_at_trx_commit directly). sql/ha_innodb.h: Remove innobase_flush_log_at_trx_commit. (Set srv_flush_log_at_trx_commit directly). sql/mysqld.cc: Bypass the variable innobase innobase_flush_log_at_trx_commit. sql/set_var.cc: Make innodb_flush_log_at_trx_commit a settable global variable.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 80b22f726ae..08a47ca70f5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4823,8 +4823,8 @@ Disable with --skip-innodb-doublewrite.", (gptr*) &innobase_use_doublewrite,
(gptr*) &innobase_file_per_table, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"innodb_flush_log_at_trx_commit", OPT_INNODB_FLUSH_LOG_AT_TRX_COMMIT,
"Set to 0 (write and flush once per second), 1 (write and flush at each commit) or 2 (write at commit, flush once per second).",
- (gptr*) &innobase_flush_log_at_trx_commit,
- (gptr*) &innobase_flush_log_at_trx_commit,
+ (gptr*) &srv_flush_log_at_trx_commit,
+ (gptr*) &srv_flush_log_at_trx_commit,
0, GET_UINT, OPT_ARG, 1, 0, 2, 0, 0, 0},
{"innodb_flush_method", OPT_INNODB_FLUSH_METHOD,
"With which method to flush data.", (gptr*) &innobase_unix_file_flush_method,