← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Monty Taylor
  • Date: 2010-05-21 06:34:40 UTC
  • mfrom: (1530.3.1)
  • mto: (1530.2.8)
  • mto: This revision was merged to the branch mainline in revision 1556.
  • Revision ID: mordred@inaugust.com-20100521063440-n98r0n8mgb0hg65d
Merged align-static-plugins into plugin-to-module.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
127
127
  if (! (table= create_tmp_table(session_arg, &tmp_table_param, *column_types,
128
128
                                 (order_st*) NULL, is_union_distinct, 1,
129
129
                                 options, HA_POS_ERROR, (char*) table_alias)))
 
130
  {
130
131
    return true;
 
132
  }
 
133
 
131
134
  table->cursor->extra(HA_EXTRA_WRITE_CACHE);
132
135
  table->cursor->extra(HA_EXTRA_IGNORE_DUP_KEY);
 
136
 
133
137
  return false;
134
138
}
135
139
 
249
253
  {
250
254
    bool can_skip_order_by;
251
255
    sl->options|=  SELECT_NO_UNLOCK;
252
 
    JOIN *join= new JOIN(session_arg, sl->item_list,
 
256
    Join *join= new Join(session_arg, sl->item_list,
253
257
                         sl->options | session_arg->options | additional_options,
254
258
                         tmp_result);
255
259
    /*
509
513
    {
510
514
      set_limit(global_parameters);
511
515
      init_prepare_fake_select_lex(session);
512
 
      JOIN *join= fake_select_lex->join;
 
516
      Join *join= fake_select_lex->join;
513
517
      if (!join)
514
518
      {
515
519
        /*
520
524
          don't let it allocate the join. Perhaps this is because we need
521
525
          some special parameter values passed to join constructor?
522
526
        */
523
 
        if (!(fake_select_lex->join= new JOIN(session, item_list,
 
527
        if (!(fake_select_lex->join= new Join(session, item_list,
524
528
                                              fake_select_lex->options, result)))
525
529
        {
526
530
          fake_select_lex->table_list.empty();
604
608
  {
605
609
    delete union_result;
606
610
    union_result=0; // Safety
607
 
    if (table)
608
 
      table->free_tmp_table(session);
609
611
    table= 0; // Safety
610
612
  }
611
613
 
614
616
 
615
617
  if (fake_select_lex)
616
618
  {
617
 
    JOIN *join;
 
619
    Join *join;
618
620
    if ((join= fake_select_lex->join))
619
621
    {
620
622
      join->tables_list= 0;