~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:6790 from MySQL InnoDB

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

Original Authors: jyang
Original commit message:
branches/zip: Fix bug #51356: "many valgrind errors in error messages
with concurrent ddl". Null terminate the name string returned
from innobase_convert_identifier() call when reporting DB_DUPLICATE_KEY
error in create_table_def().
rb://266 approved by Marko

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
438
437
        ulint           magic_n;
439
 
# define HASH_TABLE_MAGIC_N     76561114
440
 
#endif /* UNIV_DEBUG */
441
438
};
442
439
 
 
440
#define HASH_TABLE_MAGIC_N      76561114
 
441
 
443
442
#ifndef UNIV_NONINL
444
443
#include "hash0hash.ic"
445
444
#endif