~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sj_tmp_table.cc

  • Committer: Brian Aker
  • Date: 2009-05-15 07:40:30 UTC
  • mfrom: (1019.1.7 merge)
  • Revision ID: brian@gaz-20090515074030-che1sh7nqadhyj45
Code / Style cleanup merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
118
118
  {
119
119
    if (temp_pool_slot != MY_BIT_NONE)
120
120
      bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
121
 
    return(NULL);
 
121
    return NULL;
122
122
  }
123
123
  strcpy(tmpname,path);
124
124
 
330
330
  table->free_tmp_table(session);                    /* purecov: inspected */
331
331
  if (temp_pool_slot != MY_BIT_NONE)
332
332
    bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
333
 
  return(NULL);        /* purecov: inspected */
 
333
  return NULL;        /* purecov: inspected */
334
334
}