← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: lbieber
  • Date: 2010-10-01 12:16:18 UTC
  • mfrom: (1802.1.1 fix-bug-651256)
  • Revision ID: lbieber@orisndriz08-20101001121618-uqcboygpjwbiglem
Merge Vijay - fix bug 651256 - Remove --help-extended

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/os/os0proc.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1995, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
11
11
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
12
12
 
13
13
You should have received a copy of the GNU General Public License along with
14
 
this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
15
 
St, Fifth Floor, Boston, MA 02110-1301 USA
 
14
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 
15
Place, Suite 330, Boston, MA 02111-1307 USA
16
16
 
17
17
*****************************************************************************/
18
18
 
99
99
                        fprintf(stderr, "InnoDB: HugeTLB: Warning: Failed to"
100
100
                                " attach shared memory segment, errno %d\n",
101
101
                                errno);
102
 
                        ptr = NULL;
103
102
                }
104
103
 
105
104
                /* Remove the shared memory segment so that it will be
147
146
                os_fast_mutex_unlock(&ut_list_mutex);
148
147
                UNIV_MEM_ALLOC(ptr, size);
149
148
        }
150
 
#elif !defined OS_MAP_ANON
 
149
#elif defined __NETWARE__ || !defined OS_MAP_ANON
151
150
        size = *n;
152
151
        ptr = ut_malloc_low(size, TRUE, FALSE);
153
152
#else
215
214
                os_fast_mutex_unlock(&ut_list_mutex);
216
215
                UNIV_MEM_FREE(ptr, size);
217
216
        }
218
 
#elif !defined OS_MAP_ANON
 
217
#elif defined __NETWARE__ || !defined OS_MAP_ANON
219
218
        ut_free(ptr);
220
219
#else
221
 
        if (munmap(static_cast<char *>(ptr), size)) {
 
220
        if (munmap(ptr, size)) {
222
221
                fprintf(stderr, "InnoDB: munmap(%p, %lu) failed;"
223
222
                        " errno %lu\n",
224
223
                        ptr, (ulong) size, (ulong) errno);