← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

[patch 112/129] Merge patch for revision 1925 from InnoDB SVN:
revno: 1925
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6169
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6163
committer: calvin
timestamp: Thu 2009-11-12 12:40:43 +0000
message:
  branches/zip: add test case for bug#46676
  
  This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
  But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
  Add test case to catch future regression.
added:
  mysql-test/innodb_bug46676.result 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.result
  mysql-test/innodb_bug46676.test 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.test
diff:
=== added file 'mysql-test/innodb_bug46676.result'

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 OS_MAP_ANON
 
150
#elif defined __NETWARE__ || !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 OS_MAP_ANON
 
218
#elif defined __NETWARE__ || !defined OS_MAP_ANON
219
219
        ut_free(ptr);
220
220
#else
221
221
        if (munmap(ptr, size)) {