← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.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/heap/ha_heap.cc
327
327
int ha_heap::doInsertRecord(unsigned char * buf)
328
328
{
329
329
  int res;
330
 
  if (table->next_number_field && buf == table->record[0])
 
330
  if (table->next_number_field && buf == table->getInsertRecord())
331
331
  {
332
332
    if ((res= update_auto_increment()))
333
333
      return res;
729
729
    HP_COLUMNDEF* column= columndef + column_idx;
730
730
    column->type= (uint16_t)field->type();
731
731
    column->length= field->pack_length();
732
 
    column->offset= field->offset(field->getTable()->record[0]);
 
732
    column->offset= field->offset(field->getTable()->getInsertRecord());
733
733
 
734
734
    if (field->null_bit)
735
735
    {
736
736
      column->null_bit= field->null_bit;
737
 
      column->null_pos= (uint) (field->null_ptr - (unsigned char*) table_arg->record[0]);
 
737
      column->null_pos= (uint) (field->null_ptr - (unsigned char*) table_arg->getInsertRecord());
738
738
    }
739
739
    else
740
740
    {
823
823
      if (field->null_ptr)
824
824
      {
825
825
        seg->null_bit= field->null_bit;
826
 
        seg->null_pos= (uint) (field->null_ptr - (unsigned char*) table_arg->record[0]);
 
826
        seg->null_pos= (uint) (field->null_ptr - (unsigned char*) table_arg->getInsertRecord());
827
827
      }
828
828
      else
829
829
      {