~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6900 from MySQL InnoDB

Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6900

Original Authors: mmakela
Original commit message:
branches/zip: Merge c6899 from branches/innodb+:

Add debug assertions to track down Bug #52360.
hash_table_t::magic_n: Add HASH_TABLE_MAGIC_N checks, which were fully absent.
ut_hash_ulint(): Assert table_size > 0 before division.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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