← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2008-11-21 23:53:09 UTC
  • mfrom: (590.1.8 drizzle-nofrm)
  • Revision ID: brian@tangent.org-20081121235309-77pu95n2pboadtos
Merge in Stewart's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1573
1573
 
1574
1574
  free_io_cache(table);
1575
1575
  closefrm(table, 0);
1576
 
  /*
1577
 
     Check that temporary table has not been created with
1578
 
     frm_only because it has then not been created in any storage engine
1579
 
   */
 
1576
 
1580
1577
  if (delete_table)
1581
 
    rm_temporary_table(table_type, table->s->path.str, 
1582
 
                       table->s->tmp_table == TMP_TABLE_FRM_FILE_ONLY);
 
1578
    rm_temporary_table(table_type, table->s->path.str);
 
1579
 
1583
1580
  if (free_share)
1584
1581
  {
1585
1582
    free_table_share(table->s);
3856
3853
}
3857
3854
 
3858
3855
 
3859
 
bool rm_temporary_table(handlerton *base, char *path, bool frm_only)
 
3856
bool rm_temporary_table(handlerton *base, char *path)
3860
3857
{
3861
3858
  bool error=0;
3862
3859
  handler *file;
3869
3866
    error=1; /* purecov: inspected */
3870
3867
  *ext= 0;                              // remove extension
3871
3868
  file= get_new_handler((TABLE_SHARE*) 0, current_session->mem_root, base);
3872
 
  if (!frm_only && file && file->ha_delete_table(path))
 
3869
  if (file && file->ha_delete_table(path))
3873
3870
  {
3874
3871
    error=1;
3875
3872
    sql_print_warning(_("Could not remove temporary table: '%s', error: %d"),