← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Lee Bieber
  • Date: 2011-02-18 23:49:00 UTC
  • mfrom: (2182.1.4 build)
  • Revision ID: kalebral@gmail.com-20110218234900-7zxzvw9x7e7zwflr
Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization 
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
148
148
  if (sort.io_cache)
149
149
  {
150
150
    sort.io_cache->close_cached_file();
151
 
    delete sort.io_cache;
152
 
    sort.io_cache= 0;
 
151
    safe_delete(sort.io_cache);
153
152
  }
154
153
}
155
154
 
808
807
 
809
808
  if (not table::Cache::singleton().insert(table))
810
809
  {
811
 
    delete table;
 
810
    safe_delete(table);
812
811
 
813
812
    return NULL;
814
813
  }