← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2011-02-03 20:32:09 UTC
  • mfrom: (2139.1.4 drizzle-build)
  • Revision ID: brian@tangent.org-20110203203209-r1t4knmy15x5n1w2
Rollup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
3381
3381
  stored the string length as the first byte. */
3382
3382
 
3383
3383
  upd_and_key_val_buff_len =
3384
 
        getTable()->getShare()->stored_rec_length
 
3384
        getTable()->getShare()->sizeStoredRecord()
3385
3385
        + getTable()->getShare()->max_key_length
3386
3386
        + MAX_REF_PARTS * 3;
3387
3387
 
3445
3445
 
3446
3446
  prebuilt = row_create_prebuilt(ib_table);
3447
3447
 
3448
 
  prebuilt->mysql_row_len = getTable()->getShare()->stored_rec_length;
 
3448
  prebuilt->mysql_row_len = getTable()->getShare()->sizeStoredRecord();
3449
3449
  prebuilt->default_rec = getTable()->getDefaultValues();
3450
3450
  ut_ad(prebuilt->default_rec);
3451
3451
 
5369
5369
    errmsg_printf(error::ERROR, 
5370
5370
      "Innodb could not find key n:o %u with name %s "
5371
5371
      "from dict cache for table %s",
5372
 
      keynr, getTable()->getShare()->getTableProto()->indexes(keynr).name().c_str(),
 
5372
      keynr, getTable()->getShare()->getTableMessage()->indexes(keynr).name().c_str(),
5373
5373
      prebuilt->table->name);
5374
5374
  }
5375
5375
 
6833
6833
  KeyInfo*    key;
6834
6834
  dict_index_t* index;
6835
6835
  unsigned char*    key_val_buff2 = (unsigned char*) malloc(
6836
 
              getTable()->getShare()->stored_rec_length
 
6836
              getTable()->getShare()->sizeStoredRecord()
6837
6837
          + getTable()->getShare()->max_key_length + 100);
6838
 
  ulint   buff2_len = getTable()->getShare()->stored_rec_length
 
6838
  ulint   buff2_len = getTable()->getShare()->sizeStoredRecord()
6839
6839
          + getTable()->getShare()->max_key_length + 100;
6840
6840
  dtuple_t* range_start;
6841
6841
  dtuple_t* range_end;