← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

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/handler/ha_innodb.cc
7961
7961
 
7962
7962
  for (lock = UT_LIST_GET_FIRST(rw_lock_list); lock != NULL;
7963
7963
       lock = UT_LIST_GET_NEXT(list, lock)) {
7964
 
    if (lock->count_os_wait == 0) {
 
7964
    if (lock->count_os_wait) {
7965
7965
      continue;
7966
7966
    }
7967
7967
 
9430
9430
static DRIZZLE_SYSVAR_STR(change_buffering, innobase_change_buffering,
9431
9431
  PLUGIN_VAR_RQCMDARG,
9432
9432
  "Buffer changes to reduce random access: "
9433
 
  "OFF, ON, none, inserts.",
 
9433
  "OFF, ON, inserting, deleting, changing, or purging.",
9434
9434
  innodb_change_buffering_validate,
9435
9435
  innodb_change_buffering_update, NULL);
9436
9436
 
9437
9437
static DRIZZLE_SYSVAR_ULONG(read_ahead_threshold, srv_read_ahead_threshold,
9438
9438
  PLUGIN_VAR_RQCMDARG,
9439
 
  "Number of pages that must be accessed sequentially for InnoDB to "
 
9439
  "Number of pages that must be accessed sequentially for InnoDB to"
9440
9440
  "trigger a readahead.",
9441
9441
  NULL, NULL, 56, 0, 64, 0);
9442
9442