← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2010-10-22 16:47:38 UTC
  • mfrom: (1841.1.7 drizzle_pbms)
  • Revision ID: kalebral@gmail.com-20101022164738-vv8w22b8towpb307
Merge Barry - fix bug 657830: PBMS build failure in GCC 4.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/mem/mem0dbg.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1994, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1994, 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
29
29
/* The mutex which protects in the debug version the hash table
30
30
containing the list of live memory heaps, and also the global
31
31
variables below. */
32
 
UNIV_INTERN mutex_t             mem_hash_mutex;
33
 
 
34
 
#ifdef UNIV_PFS_MUTEX
35
 
/* Key to register mem_hash_mutex with performance schema */
36
 
UNIV_INTERN mysql_pfs_key_t     mem_hash_mutex_key;
37
 
#endif /* UNIV_PFS_MUTEX */
38
 
 
 
32
UNIV_INTERN mutex_t     mem_hash_mutex;
39
33
# endif /* !UNIV_HOTBACKUP */
40
34
 
41
35
/* The following variables contain information about the
155
149
        /* Initialize the hash table */
156
150
        ut_a(FALSE == mem_hash_initialized);
157
151
 
158
 
        mutex_create(mem_hash_mutex_key, &mem_hash_mutex, SYNC_MEM_HASH);
 
152
        mutex_create(&mem_hash_mutex, SYNC_MEM_HASH);
159
153
 
160
154
        for (i = 0; i < MEM_HASH_SIZE; i++) {
161
155
                UT_LIST_INIT(*mem_hash_get_nth_cell(i));
186
180
{
187
181
        mem_pool_free(mem_comm_pool);
188
182
        mem_comm_pool = NULL;
189
 
#ifdef UNIV_MEM_DEBUG
190
 
        mutex_free(&mem_hash_mutex);
191
 
        mem_hash_initialized = FALSE;
192
 
#endif /* UNIV_MEM_DEBUG */
193
183
}
194
184
#endif /* !UNIV_HOTBACKUP */
195
185
 
248
238
mem_field_erase(
249
239
/*============*/
250
240
        byte*   buf,    /*!< in: memory field */
251
 
        ulint   /*n __attribute__((unused))*/)
 
241
        ulint   n __attribute__((unused)))
252
242
                        /*!< in: how many bytes the user requested */
253
243
{
254
244
        byte*   usr_buf;
449
439
mem_heap_validate_or_print(
450
440
/*=======================*/
451
441
        mem_heap_t*     heap,   /*!< in: memory heap */
452
 
        byte*           /*top __attribute__((unused))*/,
 
442
        byte*           top __attribute__((unused)),
453
443
                                /*!< in: calculate and validate only until
454
444
                                this top pointer in the heap is reached,
455
445
                                if this pointer is NULL, ignored */