← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-23 14:35:15 UTC
  • mto: (2247.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2248.
  • Revision ID: olafvdspek@gmail.com-20110323143515-p4tn90h1ipnr7rgx
Refactor Identifier::getSQLPath()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1625
1625
                   const identifier::Table &from,
1626
1626
                   const identifier::Table &to)
1627
1627
{
1628
 
  int error= 0;
1629
 
 
1630
 
  assert(base);
1631
 
 
1632
1628
  if (not plugin::StorageEngine::doesSchemaExist(to))
1633
1629
  {
1634
1630
    my_error(ER_NO_DB_ERROR, MYF(0), to.getSchemaName().c_str());
1635
1631
    return true;
1636
1632
  }
1637
1633
 
1638
 
  error= base->renameTable(session, from, to);
1639
 
 
 
1634
  int error= base->renameTable(session, from, to);
1640
1635
  if (error == HA_ERR_WRONG_COMMAND)
1641
 
  {
1642
1636
    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "ALTER Table");
1643
 
  }
1644
1637
  else if (error)
1645
1638
  {
1646
 
    std::string from_path;
1647
 
    std::string to_path;
1648
 
 
1649
 
    from.getSQLPath(from_path);
1650
 
    to.getSQLPath(to_path);
1651
 
 
1652
 
    const char *from_identifier= from.isTmp() ? "#sql-temporary" : from_path.c_str();
1653
 
    const char *to_identifier= to.isTmp() ? "#sql-temporary" : to_path.c_str();
1654
 
 
1655
 
    my_error(ER_ERROR_ON_RENAME, MYF(0), from_identifier, to_identifier, error);
 
1639
    my_error(ER_ERROR_ON_RENAME, MYF(0), 
 
1640
                        from.isTmp() ? "#sql-temporary" : from.getSQLPath().c_str(), 
 
1641
                        to.isTmp() ? "#sql-temporary" : to.getSQLPath().c_str(), error);
1656
1642
  }
1657
 
 
1658
 
  return error ? true : false; 
 
1643
  return error; 
1659
1644
}
1660
1645
 
1661
1646
 
1768
1753
  for (table= tables; table; table= table->next_local)
1769
1754
  {
1770
1755
    identifier::Table table_identifier(table->getSchemaName(), table->getTableName());
1771
 
    std::string table_name;
1772
1756
    bool fatal_error=0;
1773
1757
 
1774
 
    table_identifier.getSQLPath(table_name);
 
1758
    std::string table_name = table_identifier.getSQLPath();
1775
1759
 
1776
1760
    table->lock_type= lock_type;
1777
1761
    /* open only one table from local list of command */