← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2009-06-05 05:40:36 UTC
  • mfrom: (1046.1.15 merge)
  • Revision ID: brian@gaz-20090605054036-1024tm3gv0oloipw
Merge of Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
4099
4099
  my_casedn_str(files_charset_info, old_name);
4100
4100
 
4101
4101
  wait_while_table_is_used(session, table, HA_EXTRA_PREPARE_FOR_RENAME);
4102
 
  close_data_files_and_morph_locks(session, db, table_name);
 
4102
  session->close_data_files_and_morph_locks(db, table_name);
4103
4103
 
4104
4104
  error=0;
4105
4105
  save_old_db_type= old_db_type;
4127
4127
                              new_alias, FN_FROM_IS_TMP) || ((new_name != table_name || new_db != db) && 0))
4128
4128
  {
4129
4129
    /* Try to get everything back. */
4130
 
    error=1;
 
4130
    error= 1;
4131
4131
    quick_rm_table(new_db_type, new_db, new_alias, false);
4132
4132
    quick_rm_table(new_db_type, new_db, tmp_name, true);
4133
4133
    mysql_rename_table(old_db_type, db, old_name, db, table_name,
4144
4144
 
4145
4145
  if (session->locked_tables && new_name == table_name && new_db == db)
4146
4146
  {
4147
 
    session->in_lock_tables= 1;
4148
 
    error= reopen_tables(session, 1, 1);
4149
 
    session->in_lock_tables= 0;
 
4147
    session->in_lock_tables= true;
 
4148
    error= session->reopen_tables(true, true);
 
4149
    session->in_lock_tables= false;
 
4150
 
4150
4151
    if (error)
4151
4152
      goto err_with_placeholders;
4152
4153
  }