Commit 48063238 authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

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
parent a9391f3c

sql/ha_innobase.cc

+3 −1
Original line number Diff line number Diff line
@@ -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;

sql/ha_innobase.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

sql/mysqld.cc

+3 −1
Original line number Diff line number Diff line
@@ -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\