← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
1605
1605
  boost::checked_delete(outparam.cursor);
1606
1606
  outparam.cursor= 0;                           // For easier error checking
1607
1607
  outparam.db_stat= 0;
1608
 
  outparam.getMemRoot().free_root(MYF(0));       // Safe to call on zeroed root
 
1608
  outparam.mem().free_root(MYF(0));       // Safe to call on zeroed root
1609
1609
  outparam.clearAlias();
1610
1610
 
1611
1611
  return ret;
1682
1682
  /* Setup copy of fields from share, but use the right alias and record */
1683
1683
  for (uint32_t i= 0 ; i < _field_size; i++, field_ptr++)
1684
1684
  {
1685
 
    if (!((*field_ptr)= _fields[i]->clone(&outparam.getMemRoot(), &outparam)))
 
1685
    if (!((*field_ptr)= _fields[i]->clone(&outparam.mem(), &outparam)))
1686
1686
      return local_error;
1687
1687
  }
1688
1688
  (*field_ptr)= 0;                              // End marker
1730
1730
            We are using only a prefix of the column as a key:
1731
1731
            Create a new field for the key part that matches the index
1732
1732
          */
1733
 
          local_field= key_part->field= local_field->new_field(&outparam.getMemRoot(), &outparam, 0);
 
1733
          local_field= key_part->field= local_field->new_field(&outparam.mem(), &outparam, 0);
1734
1734
          local_field->field_length= key_part->length;
1735
1735
        }
1736
1736
      }