← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
377
377
  int res;
378
378
  ha_statistic_increment(&system_status_var::ha_delete_count);
379
379
  res= heap_delete(file,buf);
380
 
  if (!res && table->s->tmp_table == NO_TMP_TABLE &&
 
380
  if (!res && table->s->tmp_table == STANDARD_TABLE &&
381
381
      ++records_changed*MEMORY_STATS_UPDATE_THRESHOLD > file->s->records)
382
382
  {
383
383
    /*
535
535
int ha_heap::delete_all_rows()
536
536
{
537
537
  heap_clear(file);
538
 
  if (table->s->tmp_table == NO_TMP_TABLE)
 
538
  if (table->s->tmp_table == STANDARD_TABLE)
539
539
  {
540
540
    /*
541
541
       We can perform this safely since only one writer at the time is
837
837
        key_part_size= next_field_pos;
838
838
      }
839
839
 
840
 
      if (field->flags & (ENUM_FLAG | SET_FLAG))
 
840
      if (field->flags & ENUM_FLAG)
841
841
        seg->charset= &my_charset_bin;
842
842
      else
843
843
        seg->charset= field->charset();