Commit 967c9739 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0-bug19394


sql/mysqld.cc:
  Auto merged
parents 42c47bcb 9dd7f535

sql/mysqld.cc

+2 −1
Original line number Diff line number Diff line
@@ -4579,6 +4579,7 @@ enum options_mysqld 
  OPT_INNODB_FILE_IO_THREADS,

  OPT_INNODB_LOCK_WAIT_TIMEOUT,

  OPT_INNODB_THREAD_CONCURRENCY,

  OPT_INNODB_COMMIT_CONCURRENCY,

  OPT_INNODB_FORCE_RECOVERY,

  OPT_INNODB_STATUS_FILE,

  OPT_INNODB_MAX_DIRTY_PAGES_PCT,
@@ -5520,7 +5521,7 @@ log and this option does nothing anymore.", 
   (gptr*) &innobase_buffer_pool_size, (gptr*) &innobase_buffer_pool_size, 0,

   GET_LL, REQUIRED_ARG, 8*1024*1024L, 1024*1024L, LONGLONG_MAX, 0,

   1024*1024L, 0},

  {"innodb_commit_concurrency", OPT_INNODB_THREAD_CONCURRENCY,

  {"innodb_commit_concurrency", OPT_INNODB_COMMIT_CONCURRENCY,

   "Helps in performance tuning in heavily concurrent environments.",

   (gptr*) &srv_commit_concurrency, (gptr*) &srv_commit_concurrency,

   0, GET_LONG, REQUIRED_ARG, 0, 0, 1000, 0, 1, 0},