← 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-11-02 18:37:09 UTC
  • mfrom: (1897.2.5 merge)
  • Revision ID: brian@tangent.org-20101102183709-n4qjmcju1ozku9ki
Merge of Andrew, tdavies

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
125
125
  tmp_table_param.field_count= column_types->elements;
126
126
 
127
127
  if (! (table= create_tmp_table(session_arg, &tmp_table_param, *column_types,
128
 
                                 (order_st*) NULL, is_union_distinct, 1,
 
128
                                 (Order*) NULL, is_union_distinct, 1,
129
129
                                 options, HA_POS_ERROR, (char*) table_alias)))
130
130
  {
131
131
    return true;
176
176
    fake_select_lex->context.first_name_resolution_table=
177
177
    fake_select_lex->get_table_list();
178
178
 
179
 
  for (order_st *order= (order_st *) global_parameters->order_list.first;
 
179
  for (Order *order= (Order *) global_parameters->order_list.first;
180
180
       order;
181
181
       order= order->next)
182
182
    order->item= &order->item_ptr;
183
183
 
184
 
  for (order_st *order= (order_st *)global_parameters->order_list.first;
 
184
  for (Order *order= (Order *)global_parameters->order_list.first;
185
185
       order;
186
186
       order=order->next)
187
187
  {
278
278
                                sl->order_list.elements) +
279
279
                               sl->group_list.elements,
280
280
                               can_skip_order_by ?
281
 
                               (order_st*) NULL : (order_st *)sl->order_list.first,
282
 
                               (order_st*) sl->group_list.first,
 
281
                               (Order*) NULL : (Order *)sl->order_list.first,
 
282
                               (Order*) sl->group_list.first,
283
283
                               sl->having,
284
284
                               sl, this);
285
285
    /* There are no * in the statement anymore (for PS) */
541
541
                              &result_table_list,
542
542
                              0, item_list, NULL,
543
543
                              global_parameters->order_list.elements,
544
 
                              (order_st*)global_parameters->order_list.first,
545
 
                              (order_st*) NULL, NULL,
 
544
                              (Order*)global_parameters->order_list.first,
 
545
                              (Order*) NULL, NULL,
546
546
                              fake_select_lex->options | SELECT_NO_UNLOCK,
547
547
                              result, this, fake_select_lex);
548
548
      }
564
564
                                &result_table_list,
565
565
                                0, item_list, NULL,
566
566
                                global_parameters->order_list.elements,
567
 
                                (order_st*)global_parameters->order_list.first,
568
 
                                (order_st*) NULL, NULL,
 
567
                                (Order*)global_parameters->order_list.first,
 
568
                                (Order*) NULL, NULL,
569
569
                                fake_select_lex->options | SELECT_NO_UNLOCK,
570
570
                                result, this, fake_select_lex);
571
571
        }
625
625
    error|= fake_select_lex->cleanup();
626
626
    if (fake_select_lex->order_list.elements)
627
627
    {
628
 
      order_st *ord;
629
 
      for (ord= (order_st*)fake_select_lex->order_list.first; ord; ord= ord->next)
 
628
      Order *ord;
 
629
      for (ord= (Order*)fake_select_lex->order_list.first; ord; ord= ord->next)
630
630
        (*ord->item)->cleanup();
631
631
    }
632
632
  }