diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-09-10 14:23:46 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-09-10 14:23:46 +0300 |
| commit | 7290d0d1bc687f89ad8487b75464a58edb4ea647 (patch) | |
| tree | 49d81e9d638b046769b0bded5b83089cb3e54039 | |
| parent | 01733af0310974989a266995881452f351f3cf07 (diff) | |
| download | mariadb-git-7290d0d1bc687f89ad8487b75464a58edb4ea647.tar.gz | |
mysqld.cc:
update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2
ha_innobase.h, ha_innobase.cc:
make innobase_flush_log_at_trx_commit a long, like other params
sql/ha_innobase.cc:
make innobase_flush_log_at_trx_commit a long, like other params
sql/ha_innobase.h:
make innobase_flush_log_at_trx_commit a long, like other params
sql/mysqld.cc:
update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2
| -rw-r--r-- | sql/ha_innobase.cc | 4 | ||||
| -rw-r--r-- | sql/ha_innobase.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index b27f033ff1c..72406af55fd 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -113,7 +113,7 @@ my_bool innobase_fast_shutdown = TRUE; 2 : write to the log file at each commit, but flush to disk only once per second */ -int innobase_flush_log_at_trx_commit = 0; +long innobase_flush_log_at_trx_commit = 0; /* The following counter is used to convey information to InnoDB about server activity: in selects it is not sensible to call @@ -558,6 +558,8 @@ innobase_init(void) srv_log_buffer_size = (ulint) innobase_log_buffer_size; srv_flush_log_at_trx_commit = (ulint) innobase_flush_log_at_trx_commit; + printf("Flush value %lu\n", srv_flush_log_at_trx_commit); + srv_use_native_aio = 0; srv_pool_size = (ulint) innobase_buffer_pool_size; diff --git a/sql/ha_innobase.h b/sql/ha_innobase.h index d0804707842..694d403a2d5 100644 --- a/sql/ha_innobase.h +++ b/sql/ha_innobase.h @@ -176,7 +176,7 @@ extern long innobase_force_recovery, innobase_thread_concurrency; extern char *innobase_data_home_dir, *innobase_data_file_path; extern char *innobase_log_group_home_dir, *innobase_log_arch_dir; extern char *innobase_unix_file_flush_method; -extern int innobase_flush_log_at_trx_commit; +extern long innobase_flush_log_at_trx_commit; /* The following variables have to be my_bool for SHOW VARIABLES to work */ extern my_bool innobase_log_archive, innobase_use_native_aio, innobase_fast_shutdown; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3d0ab19743b..207520d5bdc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3394,7 +3394,9 @@ Starts the MySQL server\n"); --innodb_data_file_path=dir Path to individual files and their sizes\n\ --innodb_flush_method=# With which method to flush data\n\ --innodb_flush_log_at_trx_commit[=#]\n\ - Set to 0 if you don't want to flush logs\n\ + Value 0: write and flush once per second\n\ + Value 1: write and flush at each commit\n\ + Value 2: write at commit, flush once per second\n\ --innodb_log_arch_dir=dir Where full logs should be archived\n\ --innodb_log_archive[=#] Set to 1 if you want to have logs archived\n\ --innodb_log_group_home_dir=dir Path to innodb log files.\n\ |