← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

  • Committer: Brian Aker
  • Date: 2010-03-27 04:12:14 UTC
  • mfrom: (1395.1.18 build)
  • Revision ID: brian@gaz-20100327041214-2pm5eay51312xjvq
Merge (fixes known issues in ALTER TABLE not resetting correctly DFE).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
139
139
{
140
140
  session.removeTableMessage(identifier);
141
141
 
142
 
  return heap_delete_table(identifier.getPath().c_str());
 
142
  int error= heap_delete_table(identifier.getPath().c_str());
 
143
 
 
144
  if (error == ENOENT)
 
145
    error= 0;
 
146
 
 
147
  return error;
143
148
}
144
149
 
145
150
static HeapEngine *heap_storage_engine= NULL;
356
361
  int res;
357
362
  ha_statistic_increment(&system_status_var::ha_delete_count);
358
363
  res= heap_delete(file,buf);
359
 
  if (!res && table->s->tmp_table == STANDARD_TABLE &&
 
364
  if (!res && table->s->tmp_table == message::Table::STANDARD &&
360
365
      ++records_changed*MEMORY_STATS_UPDATE_THRESHOLD > file->s->records)
361
366
  {
362
367
    /*
514
519
int ha_heap::delete_all_rows()
515
520
{
516
521
  heap_clear(file);
517
 
  if (table->s->tmp_table == STANDARD_TABLE)
 
522
  if (table->s->tmp_table == message::Table::STANDARD)
518
523
  {
519
524
    /*
520
525
       We can perform this safely since only one writer at the time is