diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-29 13:11:21 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-29 13:11:21 +0200 |
| commit | b9f47abff0386f39386ab7bd1c2f55d7f8009bd7 (patch) | |
| tree | 489c923e715b27e1aed6b47760ff4be37ed20a6f /sql | |
| parent | 89fdbbeb36a3dbc48fd56d8880fd8e910931c680 (diff) | |
| parent | 967c9739be6404941d9c0c03d7569e424fa27eab (diff) | |
| download | mariadb-git-b9f47abff0386f39386ab7bd1c2f55d7f8009bd7.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql')
| -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 a306ec392ed..ac46c1e6ada 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, @@ -5539,7 +5540,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}, |