← Back to branch summary

~posulliv/drizzle/schema-less

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Brian Aker
  • Date: 2010-03-02 07:03:12 UTC
  • mfrom: (1309.2.10 drizzle-build)
  • Revision ID: brian@gaz-20100302070312-u8xyk09u2970pgzp
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
783
783
        if (session->lock_table_name_if_not_cached(new_db, new_name, &name_lock))
784
784
          return true;
785
785
 
786
 
        if (! name_lock)
 
786
        if (not name_lock)
787
787
        {
788
788
          my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias);
789
789
          return true;
790
790
        }
791
791
 
792
 
        build_table_filename(new_name_buff, sizeof(new_name_buff), new_db, new_name_buff, false);
 
792
        TableIdentifier identifier(new_db, new_name_buff);
793
793
 
794
 
        if (plugin::StorageEngine::getTableDefinition(*session, new_name_buff, new_db, new_name_buff, false) == EEXIST)
 
794
        if (plugin::StorageEngine::getTableDefinition(*session, identifier) == EEXIST)
795
795
        {
796
796
          /* Table will be closed by Session::executeCommand() */
797
797
          my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias);