~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/btr/btr0pcur.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:
219
219
        ulint           old_mode;
220
220
        mem_heap_t*     heap;
221
221
 
222
 
        ut_ad(mtr);
223
 
        ut_ad(mtr->state == MTR_ACTIVE);
224
 
 
225
222
        index = btr_cur_get_index(btr_pcur_get_btr_cur(cursor));
226
223
 
227
224
        if (UNIV_UNLIKELY(cursor->old_stored != BTR_PCUR_OLD_STORED)