← 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: 2008-11-18 23:19:19 UTC
  • mfrom: (584.1.16 devel)
  • Revision ID: brian@tangent.org-20081118231919-w9sr347dtiwhccml
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
32
32
#include <drizzled/error.h>
33
33
#include <drizzled/gettext.h>
34
34
#include <drizzled/util/test.h>
 
35
#include <drizzled/name_resolution_context_state.h>
35
36
#include <drizzled/nested_join.h>
36
37
#include <drizzled/probes.h>
37
38
#include <drizzled/show.h>
 
39
#include <drizzled/item/cmpfunc.h>
 
40
#include <drizzled/cached_item.h>
 
41
#include <drizzled/sql_base.h>
38
42
 
39
43
#include CMATH_H
40
44
 
403
407
  Function to setup clauses without sum functions.
404
408
*/
405
409
inline int setup_without_group(Session *session, Item **ref_pointer_array,
406
 
                               TableList *tables,
407
 
                               TableList *leaves,
408
 
                               List<Item> &fields,
409
 
                               List<Item> &all_fields,
410
 
                               COND **conds,
411
 
                               order_st *order,
412
 
                               order_st *group, bool *hidden_group_fields)
 
410
                               TableList *tables,
 
411
                               TableList *leaves,
 
412
                               List<Item> &fields,
 
413
                               List<Item> &all_fields,
 
414
                               COND **conds,
 
415
                               order_st *order,
 
416
                               order_st *group, bool *hidden_group_fields)
413
417
{
414
418
  int res;
415
419
  nesting_map save_allow_sum_func=session->lex->allow_sum_func ;
649
653
  }
650
654
 
651
655
  if (having && having->with_sum_func)
652
 
    having->split_sum_func2(session, ref_pointer_array, all_fields,
653
 
                            &having, true);
 
656
    having->split_sum_func(session, ref_pointer_array, all_fields,
 
657
                           &having, true);
654
658
  if (select_lex->inner_sum_func_list)
655
659
  {
656
660
    Item_sum *end=select_lex->inner_sum_func_list;
658
662
    do
659
663
    { 
660
664
      item_sum= item_sum->next;
661
 
      item_sum->split_sum_func2(session, ref_pointer_array,
662
 
                                all_fields, item_sum->ref_by, false);
 
665
      item_sum->split_sum_func(session, ref_pointer_array,
 
666
                               all_fields, item_sum->ref_by, false);
663
667
    } while (item_sum != end);
664
668
  }
665
669