← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

merged with up to date trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
518
518
      {
519
519
        /*
520
520
          allocate JOIN for fake select only once (prevent
521
 
          mysql_select automatic allocation)
522
 
          TODO: The above is nonsense. mysql_select() will not allocate the
 
521
          select_query automatic allocation)
 
522
          TODO: The above is nonsense. select_query() will not allocate the
523
523
          join if one already exists. There must be some other reason why we
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?
537
537
          allocation.
538
538
        */
539
539
        fake_select_lex->item_list= item_list;
540
 
        saved_error= mysql_select(session, &fake_select_lex->ref_pointer_array,
 
540
        saved_error= select_query(session, &fake_select_lex->ref_pointer_array,
541
541
                              &result_table_list,
542
542
                              0, item_list, NULL,
543
543
                              global_parameters->order_list.elements,
560
560
            to reset them back, we re-do all of the actions (yes it is ugly):
561
561
          */
562
562
                join->reset(session, item_list, fake_select_lex->options, result);
563
 
          saved_error= mysql_select(session, &fake_select_lex->ref_pointer_array,
 
563
          saved_error= select_query(session, &fake_select_lex->ref_pointer_array,
564
564
                                &result_table_list,
565
565
                                0, item_list, NULL,
566
566
                                global_parameters->order_list.elements,