← 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-05-14 18:45:52 UTC
  • Revision ID: brian@gaz-20090514184552-w4avqv6cmogo77mk
Drop dead session pass

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
611
611
  }
612
612
  pthread_mutex_lock(&LOCK_open);
613
613
err_with_placeholders:
614
 
  unlock_table_names(session, tables, (TableList*) 0);
 
614
  unlock_table_names(tables, (TableList*) 0);
615
615
  pthread_mutex_unlock(&LOCK_open);
616
616
  session->no_warnings_for_error= 0;
617
617
  return(error);
2258
2258
  if (my_rename(from, tmp, MYF(MY_WME)))
2259
2259
  {
2260
2260
    pthread_mutex_lock(&LOCK_open);
2261
 
    unlock_table_name(session, table_list);
 
2261
    unlock_table_name(table_list);
2262
2262
    pthread_mutex_unlock(&LOCK_open);
2263
2263
    error= send_check_errmsg(session, table_list, "repair",
2264
2264
                             "Failed renaming data file");
2267
2267
  if (mysql_truncate(session, table_list, 1))
2268
2268
  {
2269
2269
    pthread_mutex_lock(&LOCK_open);
2270
 
    unlock_table_name(session, table_list);
 
2270
    unlock_table_name(table_list);
2271
2271
    pthread_mutex_unlock(&LOCK_open);
2272
2272
    error= send_check_errmsg(session, table_list, "repair",
2273
2273
                             "Failed generating table from .frm file");
2276
2276
  if (my_rename(tmp, from, MYF(MY_WME)))
2277
2277
  {
2278
2278
    pthread_mutex_lock(&LOCK_open);
2279
 
    unlock_table_name(session, table_list);
 
2279
    unlock_table_name(table_list);
2280
2280
    pthread_mutex_unlock(&LOCK_open);
2281
2281
    error= send_check_errmsg(session, table_list, "repair",
2282
2282
                             "Failed restoring .MYD file");
2290
2290
  pthread_mutex_lock(&LOCK_open);
2291
2291
  if (reopen_name_locked_table(session, table_list, true))
2292
2292
  {
2293
 
    unlock_table_name(session, table_list);
 
2293
    unlock_table_name(table_list);
2294
2294
    pthread_mutex_unlock(&LOCK_open);
2295
2295
    error= send_check_errmsg(session, table_list, "repair",
2296
2296
                             "Failed to open partially repaired table");