← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/ha/hash0hash.c

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:
plugin/innobase/ha/hash0hash.c
119
119
        table->heaps = NULL;
120
120
#endif /* !UNIV_HOTBACKUP */
121
121
        table->heap = NULL;
122
 
        ut_d(table->magic_n = HASH_TABLE_MAGIC_N);
 
122
        table->magic_n = HASH_TABLE_MAGIC_N;
123
123
 
124
124
        /* Initialize the cell array */
125
125
        hash_table_clear(table);
135
135
/*============*/
136
136
        hash_table_t*   table)  /*!< in, own: hash table */
137
137
{
138
 
        ut_ad(table);
139
 
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
140
138
#ifndef UNIV_HOTBACKUP
141
139
        ut_a(table->mutexes == NULL);
142
140
#endif /* !UNIV_HOTBACKUP */
162
160
{
163
161
        ulint   i;
164
162
 
165
 
        ut_ad(table);
166
 
        ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
167
163
        ut_a(n_mutexes > 0);
168
164
        ut_a(ut_is_2pow(n_mutexes));
169
165