← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-21 19:11:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2346.
  • Revision ID: olafvdspek@gmail.com-20110621191123-hddduaww44ntgdx5
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
377
377
  }
378
378
 
379
379
 
380
 
  if (setup_wild(session, fields_list, &all_fields, wild_num) ||
381
 
      select_lex->setup_ref_array(session, og_num) ||
382
 
      setup_fields(session, (*rref_pointer_array), fields_list, MARK_COLUMNS_READ,
383
 
       &all_fields, 1) ||
384
 
      setup_without_group(session, (*rref_pointer_array), tables_list,
385
 
        select_lex->leaf_tables, fields_list,
386
 
        all_fields, &conds, order, group_list,
387
 
        &hidden_group_fields))
388
 
    return(-1);
 
380
  if (setup_wild(session, fields_list, &all_fields, wild_num))
 
381
    return -1;
 
382
  select_lex->setup_ref_array(session, og_num);
 
383
  if (setup_fields(session, *rref_pointer_array, fields_list, MARK_COLUMNS_READ, &all_fields, 1) ||
 
384
    setup_without_group(session, *rref_pointer_array, tables_list, select_lex->leaf_tables, fields_list,
 
385
    all_fields, &conds, order, group_list, &hidden_group_fields))
 
386
    return -1;
389
387
 
390
388
  ref_pointer_array= *rref_pointer_array;
391
389