← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Brian Aker
  • Date: 2010-05-19 00:35:41 UTC
  • mto: This revision was merged to the branch mainline in revision 1542.
  • Revision ID: brian@gaz-20100519003541-7ecxcuwv9klvzi8l
JOIN -> Join rename

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
253
253
  {
254
254
    bool can_skip_order_by;
255
255
    sl->options|=  SELECT_NO_UNLOCK;
256
 
    JOIN *join= new JOIN(session_arg, sl->item_list,
 
256
    Join *join= new Join(session_arg, sl->item_list,
257
257
                         sl->options | session_arg->options | additional_options,
258
258
                         tmp_result);
259
259
    /*
513
513
    {
514
514
      set_limit(global_parameters);
515
515
      init_prepare_fake_select_lex(session);
516
 
      JOIN *join= fake_select_lex->join;
 
516
      Join *join= fake_select_lex->join;
517
517
      if (!join)
518
518
      {
519
519
        /*
524
524
          don't let it allocate the join. Perhaps this is because we need
525
525
          some special parameter values passed to join constructor?
526
526
        */
527
 
        if (!(fake_select_lex->join= new JOIN(session, item_list,
 
527
        if (!(fake_select_lex->join= new Join(session, item_list,
528
528
                                              fake_select_lex->options, result)))
529
529
        {
530
530
          fake_select_lex->table_list.empty();
616
616
 
617
617
  if (fake_select_lex)
618
618
  {
619
 
    JOIN *join;
 
619
    Join *join;
620
620
    if ((join= fake_select_lex->join))
621
621
    {
622
622
      join->tables_list= 0;