← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_select.cc

  • Committer: mark
  • Date: 2008-07-18 18:22:09 UTC
  • mfrom: (177.1.5 drizzle)
  • mto: This revision was merged to the branch mainline in revision 181.
  • Revision ID: mark@piggy.tangent.org-20080718182209-5xrg1e2cyvt3opc2
merge to current

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_select.cc
517
517
    thd->lex->allow_sum_func= save_allow_sum_func;
518
518
  }
519
519
 
520
 
  if (!thd->lex->view_prepare_mode)
521
520
  {
522
521
    Item_subselect *subselect;
523
522
    Item_in_subselect *in_subs= NULL;
632
631
        if ((trans_res= subselect->select_transformer(this)) !=
633
632
            Item_subselect::RES_OK)
634
633
        {
635
 
          select_lex->fix_prepare_information(thd, &conds, &having);
636
634
          return((trans_res == Item_subselect::RES_ERROR));
637
635
        }
638
636
      }
639
637
    }
640
638
  }
641
639
 
642
 
  select_lex->fix_prepare_information(thd, &conds, &having);
643
 
 
644
640
  if (order)
645
641
  {
646
642
    ORDER *ord;
1282
1278
    /* Convert all outer joins to inner joins if possible */
1283
1279
    conds= simplify_joins(this, join_list, conds, true, false);
1284
1280
    build_bitmap_for_nested_joins(join_list, 0);
1285
 
 
1286
 
    sel->prep_where= conds ? conds->copy_andor_structure(thd) : 0;
1287
1281
  }
1288
1282
 
1289
1283
  conds= optimize_cond(this, conds, join_list, &cond_value);