summaryrefslogtreecommitdiff
path: root/innobase
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 /innobase
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 'innobase')
-rw-r--r--innobase/include/srv0srv.h2
-rw-r--r--innobase/srv/srv0srv.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
index 99ea4f2de27..23c9ef1e221 100644
--- a/innobase/include/srv0srv.h
+++ b/innobase/include/srv0srv.h
@@ -77,7 +77,7 @@ extern ulint srv_n_log_groups;
extern ulint srv_n_log_files;
extern ulint srv_log_file_size;
extern ulint srv_log_buffer_size;
-extern ulint srv_flush_log_at_trx_commit;
+extern ulong srv_flush_log_at_trx_commit;
extern byte srv_latin1_ordering[256];/* The sort order table of the latin1
character set */
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
index 6e0b9b23266..694345c4142 100644
--- a/innobase/srv/srv0srv.c
+++ b/innobase/srv/srv0srv.c
@@ -113,7 +113,7 @@ ulint srv_n_log_groups = ULINT_MAX;
ulint srv_n_log_files = ULINT_MAX;
ulint srv_log_file_size = ULINT_MAX; /* size in database pages */
ulint srv_log_buffer_size = ULINT_MAX; /* size in database pages */
-ulint srv_flush_log_at_trx_commit = 1;
+ulong srv_flush_log_at_trx_commit = 1;
byte srv_latin1_ordering[256] /* The sort order table of the latin1
character set. The following table is