← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/sync0rw.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:
plugin/innobase/include/sync0rw.h
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
4
4
Copyright (c) 2008, Google Inc.
5
5
 
6
6
Portions of this file contain modifications contributed and copyrighted by
429
429
rw_lock_own(
430
430
/*========*/
431
431
        rw_lock_t*      lock,           /*!< in: rw-lock */
432
 
        ulint           lock_type)      /*!< in: lock type: RW_LOCK_SHARED,
 
432
        ulint           lock_type);     /*!< in: lock type: RW_LOCK_SHARED,
433
433
                                        RW_LOCK_EX */
434
 
        __attribute__((warn_unused_result));
435
434
#endif /* UNIV_SYNC_DEBUG */
436
435
/******************************************************************//**
437
436
Checks if somebody has locked the rw-lock in the specified mode. */