← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2010-11-14 23:15:42 UTC
  • mfrom: (1929.1.42 warning-stack-frame)
  • Revision ID: kalebral@gmail.com-20101114231542-fnnu6ydd2p17n582
Merge Monty - fix bug 672372: some functions use > 32k stack

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
284
284
                } else {\
285
285
                        /* We have to look for the predecessor of the top\
286
286
                        node */\
287
 
                        node111 = static_cast<TYPE *>(cell111->node);\
 
287
                        node111 = cell111->node;\
288
288
\
289
289
                        while (top_node111 != HASH_GET_NEXT(NAME, node111)) {\
290
290
\
291
 
                                node111 = static_cast<TYPE *>(HASH_GET_NEXT(NAME, node111));\
 
291
                                node111 = 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 = static_cast<NODE_TYPE *>(HASH_GET_FIRST((OLD_TABLE), i2222));\
 
317
                NODE_TYPE*      node2222 = HASH_GET_FIRST((OLD_TABLE), i2222);\
318
318
\
319
319
                while (node2222) {\
320
 
                        NODE_TYPE*      next2222 = static_cast<NODE_TYPE *>(node2222->PTR_NAME);\
 
320
                        NODE_TYPE*      next2222 = node2222->PTR_NAME;\
321
321
                        ulint           fold2222 = FOLD_FUNC(node2222);\
322
322
\
323
323
                        HASH_INSERT(NODE_TYPE, PTR_NAME, (NEW_TABLE),\