← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/mem/mem0mem.c

  • Committer: Lee Bieber
  • Date: 2010-11-14 05:18:07 UTC
  • mfrom: (1921.4.12 catalogs)
  • Revision ID: kalebral@gmail.com-20101114051807-p69h40jbsn1byf84
Merge Brian - add execute with no return

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/mem/mem0mem.c
347
347
                                return(NULL);
348
348
                        }
349
349
                } else {
350
 
                        buf_block = buf_block_alloc(NULL, 0);
 
350
                        buf_block = buf_block_alloc(0);
351
351
                }
352
352
 
353
353
                block = (mem_block_t*) buf_block->frame;
367
367
        block->line = line;
368
368
 
369
369
#ifdef MEM_PERIODIC_CHECK
370
 
        mutex_enter(&(mem_comm_pool->mutex));
 
370
        mem_pool_mutex_enter();
371
371
 
372
372
        if (!mem_block_list_inited) {
373
373
                mem_block_list_inited = TRUE;
376
376
 
377
377
        UT_LIST_ADD_LAST(mem_block_list, mem_block_list, block);
378
378
 
379
 
        mutex_exit(&(mem_comm_pool->mutex));
 
379
        mem_pool_mutex_exit();
380
380
#endif
381
381
        mem_block_set_len(block, len);
382
382
        mem_block_set_type(block, type);
479
479
        UT_LIST_REMOVE(list, heap->base, block);
480
480
 
481
481
#ifdef MEM_PERIODIC_CHECK
482
 
        mutex_enter(&(mem_comm_pool->mutex));
 
482
        mem_pool_mutex_enter();
483
483
 
484
484
        UT_LIST_REMOVE(mem_block_list, mem_block_list, block);
485
485
 
486
 
        mutex_exit(&(mem_comm_pool->mutex));
 
486
        mem_pool_mutex_exit();
487
487
#endif
488
488
 
489
489
        ut_ad(heap->total_size >= block->len);
554
554
{
555
555
        mem_block_t*    block;
556
556
 
557
 
        mutex_enter(&(mem_comm_pool->mutex));
 
557
        mem_pool_mutex_enter();
558
558
 
559
559
        block = UT_LIST_GET_FIRST(mem_block_list);
560
560
 
566
566
                block = UT_LIST_GET_NEXT(mem_block_list, block);
567
567
        }
568
568
 
569
 
        mutex_exit(&(mem_comm_pool->mutex));
 
569
        mem_pool_mutex_exit();
570
570
}
571
571
#endif