← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/singular.cc

  • Committer: Brian Aker
  • Date: 2011-01-17 04:15:23 UTC
  • mto: (2088.1.3 merge)
  • mto: This revision was merged to the branch mainline in revision 2089.
  • Revision ID: brian@gir-3-20110117041523-o9ex94kfz1a6iqyw
Modify TableIdentifier to fit with the rest of the identifiers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/singular.cc
142
142
{
143
143
  int error;
144
144
  
145
 
  TableIdentifier identifier(getShare()->getSchemaName(), getShare()->getTableName(), getShare()->getPath());
 
145
  identifier::Table identifier(getShare()->getSchemaName(), getShare()->getTableName(), getShare()->getPath());
146
146
  if ((error=cursor->ha_open(identifier,
147
147
                             O_RDWR,
148
148
                             HA_OPEN_TMP_TABLE | HA_OPEN_INTERNAL_TABLE)))
325
325
      cursor->closeMarkForDelete(getShare()->getTableName());
326
326
    }
327
327
 
328
 
    TableIdentifier identifier(getShare()->getSchemaName(), getShare()->getTableName(), getShare()->getTableName());
 
328
    identifier::Table identifier(getShare()->getSchemaName(), getShare()->getTableName(), getShare()->getTableName());
329
329
    drizzled::error_t ignored;
330
330
    plugin::StorageEngine::dropTable(*in_use,
331
331
                                     *getShare()->getEngine(),