← 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: 2009-03-10 22:27:47 UTC
  • mto: This revision was merged to the branch mainline in revision 929.
  • Revision ID: brian@tangent.org-20090310222747-k639h601rntikd63
Remove dead code around old procedures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
275
275
                               (order_st*) 0 : (order_st *)sl->order_list.first,
276
276
                               (order_st*) sl->group_list.first,
277
277
                               sl->having,
278
 
                               (is_union_select ? (order_st*) 0 :
279
 
                                (order_st*) NULL),
280
278
                               sl, this);
281
279
    /* There are no * in the statement anymore (for PS) */
282
280
    sl->with_wild= 0;
540
538
                              0, item_list, NULL,
541
539
                              global_parameters->order_list.elements,
542
540
                              (order_st*)global_parameters->order_list.first,
543
 
                              (order_st*) NULL, NULL, (order_st*) NULL,
 
541
                              (order_st*) NULL, NULL,
544
542
                              fake_select_lex->options | SELECT_NO_UNLOCK,
545
543
                              result, this, fake_select_lex);
546
544
      }
563
561
                                0, item_list, NULL,
564
562
                                global_parameters->order_list.elements,
565
563
                                (order_st*)global_parameters->order_list.first,
566
 
                                (order_st*) NULL, NULL, (order_st*) NULL,
 
564
                                (order_st*) NULL, NULL,
567
565
                                fake_select_lex->options | SELECT_NO_UNLOCK,
568
566
                                result, this, fake_select_lex);
569
567
        }