← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join_cache.cc

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join_cache.cc
87
87
 
88
88
                  sizeof(CACHE_FIELD*))))
89
89
  {
90
 
    free((unsigned char*) cache->buff);         /* purecov: inspected */
91
 
    cache->buff=0;                              /* purecov: inspected */
92
 
    return(1);                          /* purecov: inspected */
 
90
    free((unsigned char*) cache->buff);
 
91
    cache->buff=0;
 
92
    return(1);
93
93
  }
94
94
  copy=cache->field;
95
95
  blob_ptr=cache->blob_ptr=(CACHE_FIELD**)
163
163
  *blob_ptr= NULL;                                      /* End sequentel */
164
164
  size= max((size_t) session->variables.join_buff_size, (size_t)cache->length);
165
165
  if (!(cache->buff= (unsigned char*) malloc(size)))
166
 
    return 1;                           /* Don't use cache */ /* purecov: inspected */
 
166
    return 1;
167
167
  cache->end= cache->buff+size;
168
168
  reset_cache_write(cache);
169
169
  return 0;