← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Monty Taylor
  • Date: 2009-10-06 19:14:39 UTC
  • mfrom: (1130.2.18 plugin-base-class)
  • mto: This revision was merged to the branch mainline in revision 1184.
  • Revision ID: mordred@inaugust.com-20091006191439-fd1vvlp22654l3k3
Merged latest plugin-base-class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
549
549
    }
550
550
    else
551
551
    {
552
 
      error= ha_delete_table(session, path, db, table->table_name,
553
 
                             !dont_log_query);
 
552
      error= plugin::StorageEngine::deleteTable(session, path, db,
 
553
                                                table->table_name,
 
554
                                                ! dont_log_query);
554
555
      if ((error == ENOENT || error == HA_ERR_NO_SUCH_TABLE) &&
555
556
          if_exists)
556
557
      {
669
670
 
670
671
  build_table_filename(path, sizeof(path), db, table_name, is_tmp);
671
672
 
672
 
  return(ha_delete_table(current_session, path, db, table_name, 0) ||
673
 
              error);
 
673
  return (plugin::StorageEngine::deleteTable(current_session, path, db,
 
674
                                             table_name, 0)
 
675
          || error);
674
676
}
675
677
 
676
678
/*