diff options
| author | unknown <aivanov/alexi@mysql.com/mysqld.localdomain> | 2006-07-29 07:17:33 +0400 |
|---|---|---|
| committer | unknown <aivanov/alexi@mysql.com/mysqld.localdomain> | 2006-07-29 07:17:33 +0400 |
| commit | 7d43d6fdd6116ecc9d68b731f429adb9d280092a (patch) | |
| tree | 5cd3782315067f61e9824e040a984cf548847793 /sql/ha_innodb.cc | |
| parent | 605871f5d5fc2161e26250a3fc89b7dd4cbb9d34 (diff) | |
| download | mariadb-git-7d43d6fdd6116ecc9d68b731f429adb9d280092a.tar.gz | |
Make innodb_flush_log_at_trx_commit a settable global variable.
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.
Declare srv_flush_log_at_trx_commit.
sql/mysqld.cc:
Bypass the innobase_flush_log_at_trx_commit variable.
storage/innobase/include/srv0srv.h:
Change the type of srv_flush_log_at_trx_commit.
storage/innobase/srv/srv0srv.c:
Change the type of srv_flush_log_at_trx_commit.
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 e920eb61c42..00a92e05ffb 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -168,7 +168,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; @@ -1517,7 +1516,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. */ @@ -1974,7 +1972,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); } |