← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Brian Aker
  • Date: 2009-06-09 01:59:10 UTC
  • mfrom: (1054.1.11 merge)
  • Revision ID: brian@gaz-20090609015910-0sfsovp2x8wfbr2c
Merge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
875
875
  strcpy(fixed_name,file->filename);
876
876
 
877
877
  // Don't lock tables if we have used LOCK Table
878
 
  if (!session->locked_tables &&
879
 
      mi_lock_database(file, table->s->tmp_table ? F_EXTRA_LCK : F_WRLCK))
 
878
  if (mi_lock_database(file, table->s->tmp_table ? F_EXTRA_LCK : F_WRLCK))
880
879
  {
881
880
    mi_check_print_error(&param,ER(ER_CANT_LOCK),my_errno);
882
881
    return(HA_ADMIN_FAILED);
985
984
    update_state_info(&param, file, 0);
986
985
  }
987
986
  session->set_proc_info(old_proc_info);
988
 
  if (!session->locked_tables)
989
 
    mi_lock_database(file,F_UNLCK);
 
987
  mi_lock_database(file,F_UNLCK);
 
988
 
990
989
  return(error ? HA_ADMIN_FAILED :
991
990
              !optimize_done ? HA_ADMIN_ALREADY_DONE : HA_ADMIN_OK);
992
991
}