← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join_cache.cc

  • Committer: Brian Aker
  • Date: 2010-04-19 20:12:22 UTC
  • Revision ID: brian@gaz-20100419201222-tsv74csdp0kw7fiu
Small bug fix for when make_field lacks a mem_root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join_cache.cc
86
86
    }
87
87
  }
88
88
  if (!(cache->field=(CACHE_FIELD*)
89
 
        memory::sql_alloc(sizeof(CACHE_FIELD)*(cache->fields+table_count*2)+(blobs+1)*
90
 
 
91
 
                  sizeof(CACHE_FIELD*))))
 
89
        memory::sql_alloc(sizeof(CACHE_FIELD)*(cache->fields+table_count*2)+(blobs+1)* sizeof(CACHE_FIELD*))))
92
90
  {
93
91
    free((unsigned char*) cache->buff);
94
92
    cache->buff=0;