← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/que/que0que.c

  • Committer: Brian Aker
  • Date: 2010-12-08 22:35:56 UTC
  • mfrom: (1819.9.158 update-innobase)
  • Revision ID: brian@tangent.org-20101208223556-37mi4omqg7lkjzf3
Merge in Stewart's changes, 1.3 changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/que/que0que.c
1283
1283
        que_thr_t*      thr)    /*!< in: query thread */
1284
1284
{
1285
1285
        que_thr_t*      next_thr;
1286
 
        ulint           cumul_resource;
1287
1286
        ulint           loop_count;
1288
1287
 
1289
1288
        ut_ad(thr->state == QUE_THR_RUNNING);
1290
1289
        ut_a(thr_get_trx(thr)->error_state == DB_SUCCESS);
1291
1290
        ut_ad(!mutex_own(&kernel_mutex));
1292
1291
 
1293
 
        /* cumul_resource counts how much resources the OS thread (NOT the
1294
 
        query thread) has spent in this function */
1295
 
 
1296
1292
        loop_count = QUE_MAX_LOOPS_WITHOUT_CHECK;
1297
 
        cumul_resource = 0;
1298
1293
loop:
1299
1294
        /* Check that there is enough space in the log to accommodate
1300
1295
        possible log entries by this query step; if the operation can touch