← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Brian Aker
  • Date: 2010-10-10 02:00:34 UTC
  • mfrom: (1830.1.5 trunk-drizzle)
  • Revision ID: brian@tangent.org-20101010020034-d67x3d09fssxq1v6
Merge rollup of utf8 and table encapsulation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
1177
1177
        new_table->intern_close_table();
1178
1178
        if (new_table->hasShare())
1179
1179
        {
1180
 
          delete new_table->s;
1181
 
          new_table->s= NULL;
 
1180
          delete new_table->getMutableShare();
1182
1181
        }
1183
1182
 
1184
1183
        delete new_table;
1228
1227
 
1229
1228
      if (new_table->hasShare())
1230
1229
      {
1231
 
        delete new_table->s;
1232
 
        new_table->s= NULL;
 
1230
        delete new_table->getMutableShare();
1233
1231
      }
1234
1232
 
1235
1233
      delete new_table;
1446
1444
   * don't get the usual automatic call to StorageEngine::startStatement(), so
1447
1445
   * we manually call it here...
1448
1446
   */
1449
 
  to->s->getEngine()->startStatement(session);
 
1447
  to->getMutableShare()->getEngine()->startStatement(session);
1450
1448
 
1451
1449
  if (!(copy= new CopyField[to->getShare()->sizeFields()]))
1452
1450
    return -1;