← Back to branch summary

~stewart/drizzle/nofrm

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Stewart Smith
  • Date: 2009-02-22 06:28:04 UTC
  • mfrom: (869.1.29 drizzle)
  • Revision ID: stewart@flamingspork.com-20090222062804-ssplgcffmroxwjph
merge mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
267
267
*/
268
268
 
269
269
bool handle_select(Session *session, LEX *lex, select_result *result,
270
 
                   ulong setup_tables_done_option)
 
270
                   uint64_t setup_tables_done_option)
271
271
{
272
272
  bool res;
273
273
  register Select_Lex *select_lex = &lex->select_lex;
13867
13867
  cache->length=length+blobs*sizeof(char*);
13868
13868
  cache->blobs=blobs;
13869
13869
  *blob_ptr= NULL;                                      /* End sequentel */
13870
 
  size= cmax(session->variables.join_buff_size, (uint32_t)cache->length);
 
13870
  size= max((size_t)session->variables.join_buff_size,
 
13871
            (size_t)cache->length);
13871
13872
  if (!(cache->buff=(unsigned char*) malloc(size)))
13872
13873
    return 1;                           /* Don't use cache */ /* purecov: inspected */
13873
13874
  cache->end=cache->buff+size;