← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Brian Aker
  • Date: 2010-07-30 20:31:19 UTC
  • mto: This revision was merged to the branch mainline in revision 1679.
  • Revision ID: brian@gaz-20100730203119-89g2ye4zwnvcacxg
First pass in encapsulating row

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
268
268
      {
269
269
        keydef[i].seg[j].null_bit= field->null_bit;
270
270
        keydef[i].seg[j].null_pos= (uint) (field->null_ptr-
271
 
                                           (unsigned char*) table_arg->record[0]);
 
271
                                           (unsigned char*) table_arg->getInsertRecord());
272
272
      }
273
273
      else
274
274
      {
287
287
  }
288
288
  if (table_arg->found_next_number_field)
289
289
    keydef[share->next_number_index].flag|= HA_AUTO_KEY;
290
 
  record= table_arg->record[0];
 
290
  record= table_arg->getInsertRecord();
291
291
  recpos= 0;
292
292
  recinfo_pos= recinfo;
293
293
  while (recpos < (uint) share->stored_rec_length)
336
336
    {
337
337
      recinfo_pos->null_bit= found->null_bit;
338
338
      recinfo_pos->null_pos= (uint) (found->null_ptr -
339
 
                                     (unsigned char*) table_arg->record[0]);
 
339
                                     (unsigned char*) table_arg->getInsertRecord());
340
340
    }
341
341
    else
342
342
    {
658
658
    If we have an auto_increment column and we are writing a changed row
659
659
    or a new row, then update the auto_increment value in the record.
660
660
  */
661
 
  if (table->next_number_field && buf == table->record[0])
 
661
  if (table->next_number_field && buf == table->getInsertRecord())
662
662
  {
663
663
    int error;
664
664
    if ((error= update_auto_increment()))
1424
1424
  mi_flush_bulk_insert(file, table->getShare()->next_number_index);
1425
1425
 
1426
1426
  (void) extra(HA_EXTRA_KEYREAD);
1427
 
  key_copy(key, table->record[0],
 
1427
  key_copy(key, table->getInsertRecord(),
1428
1428
           &table->key_info[table->getShare()->next_number_index],
1429
1429
           table->getShare()->next_number_key_offset);
1430
 
  error= mi_rkey(file, table->record[1], (int) table->getShare()->next_number_index,
 
1430
  error= mi_rkey(file, table->getUpdateRecord(), (int) table->getShare()->next_number_index,
1431
1431
                 key, make_prev_keypart_map(table->getShare()->next_number_keypart),
1432
1432
                 HA_READ_PREFIX_LAST);
1433
1433
  if (error)
1434
1434
    nr= 1;
1435
1435
  else
1436
1436
  {
1437
 
    /* Get data from record[1] */
 
1437
    /* Get data from getUpdateRecord() */
1438
1438
    nr= ((uint64_t) table->next_number_field->
1439
1439
         val_int_offset(table->getShare()->rec_buff_length)+1);
1440
1440
  }