diff options
| author | unknown <aivanov@mysql.com> | 2006-01-18 15:02:03 +0300 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-01-18 15:02:03 +0300 |
| commit | 74f499faded76c73f68167cae30e8e0a927d96c7 (patch) | |
| tree | a6ad6903648d640413b3687a0463715e3997be7e /sql/ha_innodb.cc | |
| parent | 596666f74a83e989edb712eab9949d2a13c08fac (diff) | |
| download | mariadb-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/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index c0f8559ab29..e66e79fde29 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -167,7 +167,6 @@ char* innobase_unix_file_flush_method = NULL; /* Below we have boolean-valued start-up parameters, and their default values */ -uint innobase_flush_log_at_trx_commit = 1; ulong innobase_fast_shutdown = 1; my_bool innobase_log_archive = FALSE;/* unused */ my_bool innobase_use_doublewrite = TRUE; @@ -1341,7 +1340,6 @@ innobase_init(void) srv_log_archive_on = (ulint) innobase_log_archive; #endif /* UNIV_LOG_ARCHIVE */ srv_log_buffer_size = (ulint) innobase_log_buffer_size; - srv_flush_log_at_trx_commit = (ulint) innobase_flush_log_at_trx_commit; /* We set srv_pool_size here in units of 1 kB. InnoDB internally changes the value so that it becomes the number of database pages. */ @@ -1816,7 +1814,7 @@ innobase_commit_complete( trx->active_trans = 0; - if (srv_flush_log_at_trx_commit == 0) { + if (UNIV_UNLIKELY(srv_flush_log_at_trx_commit == 0)) { return(0); } |