Commit 3fef3c7e authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi
Browse files

mysqld.cc: 

  Changed default of file_io_threads to 4 and lock_wait_timeout to 50 seconds
  Added a missing break: if not specified, innodb_fast_shutdown got the same value as ..flush_log_at_trx commit
parent 7f44419d

sql/mysqld.cc

+3 −2
Original line number Diff line number Diff line
@@ -2830,9 +2830,9 @@ CHANGEABLE_VAR changeable_vars[] = { 
   (long*) &innobase_additional_mem_pool_size, 1*1024*1024L, 512*1024L,

     ~0L, 0, 1024},

  {"innodb_file_io_threads",

     (long*) &innobase_file_io_threads, 9, 4, 64, 0, 1},

     (long*) &innobase_file_io_threads, 4, 4, 64, 0, 1},

  {"innodb_lock_wait_timeout",

     (long*) &innobase_lock_wait_timeout, 1024 * 1024 * 1024, 1,

     (long*) &innobase_lock_wait_timeout, 50, 1,

						1024 * 1024 * 1024, 0, 1},

  {"innodb_thread_concurrency",

     (long*) &innobase_thread_concurrency, 8, 1, 1000, 0, 1},
@@ -3935,6 +3935,7 @@ static void get_options(int argc,char **argv) 
      break;

    case OPT_INNODB_FLUSH_LOG_AT_TRX_COMMIT:

      innobase_flush_log_at_trx_commit= optarg ? test(atoi(optarg)) : 1;

      break;

    case OPT_INNODB_FAST_SHUTDOWN:

      innobase_fast_shutdown= optarg ? test(atoi(optarg)) : 1;

      break;