← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2009-03-11 19:04:31 UTC
  • mfrom: (923.1.10 merge)
  • Revision ID: brian@tangent.org-20090311190431-sptimed1l5vk3nwu
Dead proc code (merge)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
290
290
                      (order_st*) select_lex->order_list.first,
291
291
                      (order_st*) select_lex->group_list.first,
292
292
                      select_lex->having,
293
 
                      NULL,
294
293
                      select_lex->options | session->options |
295
294
                      setup_tables_done_option,
296
295
                      result, unit, select_lex);
465
464
              uint32_t wild_num, COND *conds_init, uint32_t og_num,
466
465
              order_st *order_init, order_st *group_init,
467
466
              Item *having_init,
468
 
              order_st *proc_param_init, Select_Lex *select_lex_arg,
 
467
              Select_Lex *select_lex_arg,
469
468
              Select_Lex_Unit *unit_arg)
470
469
{
471
470
  // to prevent double initialization on EXPLAIN
476
475
  order= order_init;
477
476
  group_list= group_init;
478
477
  having= having_init;
479
 
  proc_param= proc_param_init;
480
478
  tables_list= tables_init;
481
479
  select_lex= select_lex_arg;
482
480
  select_lex->join= this;
2603
2601
  @param order                linked list of order_st BY agruments
2604
2602
  @param group                linked list of GROUP BY arguments
2605
2603
  @param having               top level item of HAVING expression
2606
 
  @param proc_param           list of PROCEDUREs
2607
2604
  @param select_options       select options (BIG_RESULT, etc)
2608
2605
  @param result               an instance of result set handling class.
2609
2606
                              This object is responsible for send result
2627
2624
mysql_select(Session *session, Item ***rref_pointer_array,
2628
2625
             TableList *tables, uint32_t wild_num, List<Item> &fields,
2629
2626
             COND *conds, uint32_t og_num,  order_st *order, order_st *group,
2630
 
             Item *having, order_st *proc_param, uint64_t select_options,
 
2627
             Item *having, uint64_t select_options,
2631
2628
             select_result *result, Select_Lex_Unit *unit,
2632
2629
             Select_Lex *select_lex)
2633
2630
{
2657
2654
      else
2658
2655
      {
2659
2656
        if ((err= join->prepare(rref_pointer_array, tables, wild_num,
2660
 
                               conds, og_num, order, group, having, proc_param,
2661
 
                               select_lex, unit)))
 
2657
                               conds, og_num, order, group, having, select_lex, unit)))
2662
2658
        {
2663
2659
          goto err;
2664
2660
        }
2674
2670
    session->set_proc_info("init");
2675
2671
    session->used_tables=0;                         // Updated by setup_fields
2676
2672
    if ((err= join->prepare(rref_pointer_array, tables, wild_num,
2677
 
                           conds, og_num, order, group, having, proc_param,
 
2673
                           conds, og_num, order, group, having,
2678
2674
                           select_lex, unit)) == true)
2679
2675
    {
2680
2676
      goto err;
16250
16246
                        (order_st*) first->order_list.first,
16251
16247
                        (order_st*) first->group_list.first,
16252
16248
                        first->having,
16253
 
                        (order_st*) NULL,
16254
16249
                        first->options | session->options | SELECT_DESCRIBE,
16255
16250
                        result, unit, first);
16256
16251
  }