← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/os/os0proc.c

  • Committer: Lee Bieber
  • Date: 2010-12-03 01:16:19 UTC
  • mfrom: (1819.9.81 update-innobase)
  • Revision ID: kalebral@gmail.com-20101203011619-n6v584rijwdet05b
Merge Stewart - update Innobase plugin based on InnoDB 1.1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/os/os0proc.c
147
147
                os_fast_mutex_unlock(&ut_list_mutex);
148
148
                UNIV_MEM_ALLOC(ptr, size);
149
149
        }
150
 
#elif defined __NETWARE__ || !defined OS_MAP_ANON
 
150
#elif !defined OS_MAP_ANON
151
151
        size = *n;
152
152
        ptr = ut_malloc_low(size, TRUE, FALSE);
153
153
#else
215
215
                os_fast_mutex_unlock(&ut_list_mutex);
216
216
                UNIV_MEM_FREE(ptr, size);
217
217
        }
218
 
#elif defined __NETWARE__ || !defined OS_MAP_ANON
 
218
#elif !defined OS_MAP_ANON
219
219
        ut_free(ptr);
220
220
#else
221
221
        if (munmap(ptr, size)) {