← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/hash0hash.h

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/hash0hash.h
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1997, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (C) 1997, 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., 59 Temple
15
 
Place, Suite 330, Boston, MA 02111-1307 USA
 
14
this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
 
15
St, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
*****************************************************************************/
18
18
 
284
284
                } else {\
285
285
                        /* We have to look for the predecessor of the top\
286
286
                        node */\
287
 
                        node111 = cell111->node;\
 
287
                        node111 = static_cast<TYPE *>(cell111->node);\
288
288
\
289
289
                        while (top_node111 != HASH_GET_NEXT(NAME, node111)) {\
290
290
\
291
 
                                node111 = HASH_GET_NEXT(NAME, node111);\
 
291
                                node111 = static_cast<TYPE *>(HASH_GET_NEXT(NAME, node111));\
292
292
                        }\
293
293
\
294
294
                        /* Now we have the predecessor node */\
314
314
        cell_count2222 = hash_get_n_cells(OLD_TABLE);\
315
315
\
316
316
        for (i2222 = 0; i2222 < cell_count2222; i2222++) {\
317
 
                NODE_TYPE*      node2222 = HASH_GET_FIRST((OLD_TABLE), i2222);\
 
317
                NODE_TYPE*      node2222 = static_cast<NODE_TYPE *>(HASH_GET_FIRST((OLD_TABLE), i2222));\
318
318
\
319
319
                while (node2222) {\
320
 
                        NODE_TYPE*      next2222 = node2222->PTR_NAME;\
 
320
                        NODE_TYPE*      next2222 = static_cast<NODE_TYPE *>(node2222->PTR_NAME);\
321
321
                        ulint           fold2222 = FOLD_FUNC(node2222);\
322
322
\
323
323
                        HASH_INSERT(NODE_TYPE, PTR_NAME, (NEW_TABLE),\
434
434
                                these heaps */
435
435
#endif /* !UNIV_HOTBACKUP */
436
436
        mem_heap_t*     heap;
 
437
#ifdef UNIV_DEBUG
437
438
        ulint           magic_n;
 
439
# define HASH_TABLE_MAGIC_N     76561114
 
440
#endif /* UNIV_DEBUG */
438
441
};
439
442
 
440
 
#define HASH_TABLE_MAGIC_N      76561114
441
 
 
442
443
#ifndef UNIV_NONINL
443
444
#include "hash0hash.ic"
444
445
#endif