← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/rename.cc

  • Committer: Brian Aker
  • Date: 2009-07-28 20:12:26 UTC
  • mfrom: (1093.1.32 captain)
  • Revision ID: brian@gaz-20090728201226-k94ilbrkkwet1fdx
Merge Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/rename.cc
162
162
  }
163
163
 
164
164
  StorageEngine *engine= NULL;
165
 
 
166
 
  if (ha_table_exists_in_engine(session, ren_table->db, old_alias, &engine)
167
 
     != HA_ERR_TABLE_EXIST)
 
165
  drizzled::message::Table table_proto;
 
166
  char path[FN_REFLEN];
 
167
  size_t length;
 
168
 
 
169
  length= build_table_filename(path, sizeof(path),
 
170
                               ren_table->db, old_alias, false);
 
171
 
 
172
  if (StorageEngine::getTableProto(path, &table_proto)!= EEXIST)
168
173
  {
169
174
    my_error(ER_NO_SUCH_TABLE, MYF(0), ren_table->db, old_alias);
170
175
    return true;
171
176
  }
172
177
 
173
 
  if (ha_table_exists_in_engine(session, new_db, new_alias)
174
 
      !=HA_ERR_NO_SUCH_TABLE)
 
178
  engine= ha_resolve_by_name(session, table_proto.engine().name());
 
179
 
 
180
  length= build_table_filename(path, sizeof(path),
 
181
                               new_db, new_alias, false);
 
182
 
 
183
  if (StorageEngine::getTableProto(path, NULL)!=ENOENT)
175
184
  {
176
185
    my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias);
177
186
    return(1);                  // This can't be skipped