← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/singular.cc

  • Committer: Mark Atwood
  • Date: 2011-06-25 15:38:53 UTC
  • mfrom: (2318.6.78 refactor16)
  • Revision ID: me@mark.atwood.name-20110625153853-za5fjiwd3z0aykdd
merge lp:~olafvdspek/drizzle/refactor16

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/singular.cc
182
182
  if (getShare()->sizeKeys())
183
183
  {                                             // Get keys for ni_create
184
184
    bool using_unique_constraint= false;
185
 
    HA_KEYSEG *seg= (HA_KEYSEG*) mem().alloc(sizeof(*seg) * keyinfo->key_parts);
 
185
    HA_KEYSEG *seg= new (mem()) HA_KEYSEG[keyinfo->key_parts];
186
186
 
187
187
    memset(seg, 0, sizeof(*seg) * keyinfo->key_parts);
188
188
    if (keyinfo->key_length >= cursor->getEngine()->max_key_length() ||