← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/rename.cc

  • Committer: Monty Taylor
  • Date: 2009-03-24 18:13:47 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 964.
  • Revision ID: mordred@inaugust.com-20090324181347-phblgoj913uph2hs
Rename hton to engine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/rename.cc
169
169
    new_alias= new_table_name;
170
170
  }
171
171
 
172
 
  StorageEngine *hton= NULL;
 
172
  StorageEngine *engine= NULL;
173
173
 
174
 
  if(ha_table_exists_in_engine(session, ren_table->db, old_alias, &hton)
 
174
  if(ha_table_exists_in_engine(session, ren_table->db, old_alias, &engine)
175
175
     != HA_ERR_TABLE_EXIST)
176
176
  {
177
177
    my_error(ER_NO_SUCH_TABLE, MYF(0), ren_table->db, old_alias);
185
185
    return(1);                  // This can't be skipped
186
186
  }
187
187
 
188
 
  rc= mysql_rename_table(hton,
 
188
  rc= mysql_rename_table(engine,
189
189
                         ren_table->db, old_alias,
190
190
                         new_db, new_alias, 0);
191
191
  if (rc && !skip_error)