diff options
| author | unknown <elliot@mysql.com> | 2006-05-24 09:02:55 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-05-24 09:02:55 -0400 |
| commit | 967c9739be6404941d9c0c03d7569e424fa27eab (patch) | |
| tree | 534c54ff44b40bda548fd1dff411981bd4f01019 /sql/mysqld.cc | |
| parent | 42c47bcbbc714101d652ebcc6e4f1504ee5cec09 (diff) | |
| parent | 9dd7f5359c238056a798c3bb80dccd84b53cd8e5 (diff) | |
| download | mariadb-git-967c9739be6404941d9c0c03d7569e424fa27eab.tar.gz | |
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
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 ef2f52a33df..55653447c10 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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}, |