diff options
| author | msvensson@neptunus.(none) <> | 2006-05-29 15:06:37 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-05-29 15:06:37 +0200 |
| commit | 076ddbf840d9cb55c87a56ca823ea3563359f34a (patch) | |
| tree | bbd45be3e5f91cc6952c9b85995f17d5f3df6ffc /sql/mysqld.cc | |
| parent | 3fe937b1f47e4db36956ba112d542f4041f4456b (diff) | |
| parent | 3e2c08cc99b29f30021062c05bca514c9d20b614 (diff) | |
| download | mariadb-git-076ddbf840d9cb55c87a56ca823ea3563359f34a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 158f707d782..e44c353e6b2 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4598,6 +4598,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, @@ -5540,7 +5541,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}, |