← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2009-05-15 07:16:35 UTC
  • mto: This revision was merged to the branch mainline in revision 1021.
  • Revision ID: brian@gaz-20090515071635-chkog3hw0ht2f8mw
A number of random cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
3302
3302
  {
3303
3303
    if (temp_pool_slot != MY_BIT_NONE)
3304
3304
      bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
3305
 
    return(NULL);                               /* purecov: inspected */
 
3305
    return NULL;                                /* purecov: inspected */
3306
3306
  }
3307
3307
  /* Copy_field belongs to Tmp_Table_Param, allocate it in Session mem_root */
3308
3308
  if (!(param->copy_field= copy= new (session->mem_root) Copy_field[field_count]))
3310
3310
    if (temp_pool_slot != MY_BIT_NONE)
3311
3311
      bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
3312
3312
    free_root(&own_root, MYF(0));               /* purecov: inspected */
3313
 
    return(NULL);                               /* purecov: inspected */
 
3313
    return NULL;                                /* purecov: inspected */
3314
3314
  }
3315
3315
  param->items_to_copy= copy_func;
3316
3316
  strcpy(tmpname,path);
3861
3861
  table->free_tmp_table(session);                    /* purecov: inspected */
3862
3862
  if (temp_pool_slot != MY_BIT_NONE)
3863
3863
    bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
3864
 
  return(NULL);                         /* purecov: inspected */
 
3864
  return NULL;                          /* purecov: inspected */
3865
3865
}
3866
3866
 
3867
3867
/****************************************************************************/