← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: lbieber
  • Date: 2009-06-09 03:08:16 UTC
  • mfrom: (1055 staging)
  • mto: (1061.1.3 merge-all)
  • mto: This revision was merged to the branch mainline in revision 1062.
  • Revision ID: lbieber@lbieber-laptop-20090609030816-r0exbzj7gbirrab1
merge with latest from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1607
1607
      if ((file= get_new_handler(this, current_session->mem_root,
1608
1608
                                 db_type())))
1609
1609
      {
1610
 
        if (!(datext= *file->bas_ext()))
 
1610
        if (!(datext= *db_type()->bas_ext()))
1611
1611
          datext= "";
1612
1612
      }
1613
1613
    }
3672
3672
    if (db_stat)
3673
3673
      file->ha_drop_table(s->table_name.str);
3674
3674
    else
3675
 
      file->ha_delete_table(s->table_name.str);
 
3675
      s->db_type()->deleteTable(session, s->table_name.str);
3676
3676
    delete file;
3677
3677
  }
3678
3678
 
3784
3784
  (void) table->file->ha_rnd_end();
3785
3785
  (void) new_table.file->close();
3786
3786
 err1:
3787
 
  new_table.file->ha_delete_table(new_table.s->table_name.str);
 
3787
  new_table.s->db_type()->deleteTable(session, new_table.s->table_name.str);
3788
3788
 err2:
3789
3789
  delete new_table.file;
3790
3790
  session->set_proc_info(save_proc_info);