diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-11-24 14:04:38 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-11-24 14:04:38 +0100 |
| commit | 9b9339575280abab4e8d3dac0b4c687c0f15b7b6 (patch) | |
| tree | f60f369f2912d888ed2f013b83f52031eebee24b /storage/xtradb/que | |
| parent | 5a1e000281e20a8e198e258a13e468e8d02c32d5 (diff) | |
| parent | b0d3898dc8cafcdae02481c5ac9986212278a61d (diff) | |
| download | mariadb-git-9b9339575280abab4e8d3dac0b4c687c0f15b7b6.tar.gz | |
Merge XtraDB from Percona-Server 5.1.52-11.6 into MariaDB 5.1
revid:oleg.tsarev@percona.com-20101118145125-wjhjrb5jwhi0g7sj
Diffstat (limited to 'storage/xtradb/que')
| -rw-r--r-- | storage/xtradb/que/que0que.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/xtradb/que/que0que.c b/storage/xtradb/que/que0que.c index 5c85a04d139..9c1d61c1731 100644 --- a/storage/xtradb/que/que0que.c +++ b/storage/xtradb/que/que0que.c @@ -1298,18 +1298,13 @@ que_run_threads_low( que_thr_t* thr) /*!< in: query thread */ { que_thr_t* next_thr; - ulint cumul_resource; ulint loop_count; ut_ad(thr->state == QUE_THR_RUNNING); ut_a(thr_get_trx(thr)->error_state == DB_SUCCESS); ut_ad(!mutex_own(&kernel_mutex)); - /* cumul_resource counts how much resources the OS thread (NOT the - query thread) has spent in this function */ - loop_count = QUE_MAX_LOOPS_WITHOUT_CHECK; - cumul_resource = 0; loop: /* Check that there is enough space in the log to accommodate possible log entries by this query step; if the operation can touch |