← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/ut/ut0mem.c

  • Committer: Monty Taylor
  • Date: 2010-11-26 22:50:54 UTC
  • mfrom: (1953.1.6 build)
  • Revision ID: mordred@inaugust.com-20101126225054-sg90svw8579t5p3i
Stewart - InnoDB 1.1.1
Monty - Fixed some autoconf tests which were returning false positives.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/ut/ut0mem.c
291
291
#endif /* !UNIV_HOTBACKUP */
292
292
 
293
293
/**********************************************************************//**
294
 
Frees a memory block allocated with ut_malloc. */
 
294
Frees a memory block allocated with ut_malloc. Freeing a NULL pointer is
 
295
a nop. */
295
296
UNIV_INTERN
296
297
void
297
298
ut_free(
298
299
/*====*/
299
 
        void* ptr)  /*!< in, own: memory block */
 
300
        void* ptr)  /*!< in, own: memory block, can be NULL */
300
301
{
301
302
#ifndef UNIV_HOTBACKUP
302
303
        ut_mem_block_t* block;
303
304
 
304
 
        if (UNIV_LIKELY(srv_use_sys_malloc)) {
 
305
        if (ptr == NULL) {
 
306
                return;
 
307
        } else if (UNIV_LIKELY(srv_use_sys_malloc)) {
305
308
                free(ptr);
306
309
                return;
307
310
        }