diff options
| author | unknown <aivanov@mysql.com> | 2006-01-18 15:20:56 +0300 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-01-18 15:20:56 +0300 |
| commit | e3f0690d9bff930075ff644c8abeadddbc59bade (patch) | |
| tree | 3b690b43dc0aa84a0dd3eea5a7d5d92d804409a8 /sql/ha_innodb.cc | |
| parent | 74f499faded76c73f68167cae30e8e0a927d96c7 (diff) | |
| download | mariadb-git-e3f0690d9bff930075ff644c8abeadddbc59bade.tar.gz | |
Applied patch recieved from Marko:
Make innodb_thread_concurrency 0 by default, and extend the usable
range from 0 to 1000 (0 disables the thread throttling).
innobase/include/srv0srv.h:
Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
innobase/srv/srv0srv.c:
Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
mysql-test/r/innodb.result:
innodb_thread_concurrency is 0..1000 now, and the default is 0.
mysql-test/t/innodb.test:
innodb_thread_concurrency is 0..1000 now.
sql/ha_innodb.cc:
Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
sql/mysqld.cc:
innodb_thread_concurrency is 0..1000 now, and 0 (the default)
disables the thread throttling.
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index e66e79fde29..b33d2dfbd97 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -338,7 +338,7 @@ innodb_srv_conc_enter_innodb( /*=========================*/ trx_t* trx) /* in: transaction handle */ { - if (UNIV_LIKELY(srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD)) { + if (UNIV_LIKELY(!srv_thread_concurrency)) { return; } @@ -355,7 +355,7 @@ innodb_srv_conc_exit_innodb( /*========================*/ trx_t* trx) /* in: transaction handle */ { - if (UNIV_LIKELY(srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD)) { + if (UNIV_LIKELY(!srv_thread_concurrency)) { return; } |