diff options
| author | mskold@mysql.com <> | 2005-07-06 13:10:12 +0200 |
|---|---|---|
| committer | mskold@mysql.com <> | 2005-07-06 13:10:12 +0200 |
| commit | 9ef31a2825feb2d06844af9e8972e007147d702b (patch) | |
| tree | d44d6e2ae7df21bc14bdf0387640fea0b67f72de /sql | |
| parent | 458618d1025134c02bb5861d28664fdb497587fd (diff) | |
| parent | 8b2f9e8f25041a1c78febf4e08258033d58bd439 (diff) | |
| download | mariadb-git-9ef31a2825feb2d06844af9e8972e007147d702b.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
Diffstat (limited to 'sql')
| -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 8218e4fecc0..e33a0939e27 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -326,7 +326,7 @@ innodb_srv_conc_enter_innodb( /*=========================*/ trx_t* trx) /* in: transaction handle */ { - if (UNIV_LIKELY(srv_thread_concurrency >= 20)) { + if (UNIV_LIKELY(srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD)) { return; } @@ -343,7 +343,7 @@ innodb_srv_conc_exit_innodb( /*========================*/ trx_t* trx) /* in: transaction handle */ { - if (UNIV_LIKELY(srv_thread_concurrency >= 20)) { + if (UNIV_LIKELY(srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD)) { return; } |