← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty Taylor
  • Date: 2009-03-10 00:31:09 UTC
  • mto: This revision was merged to the branch mainline in revision 928.
  • Revision ID: mordred@inaugust.com-20090310003109-hkgrkajq2zvjqwmi
Changed some names that conflict with c++0x reserved names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
108
108
static bool only_eq_ref_tables(JOIN *join, order_st *order, table_map tables);
109
109
static void update_depend_map(JOIN *join);
110
110
static void update_depend_map(JOIN *join, order_st *order);
111
 
static order_st *remove_const(JOIN *join,order_st *first_order,COND *cond,
112
 
                           bool change_list, bool *simple_order);
 
111
static order_st *remove_constants(JOIN *join,order_st *first_order,COND *cond,
 
112
                                  bool change_list, bool *simple_order);
113
113
static int return_zero_rows(JOIN *join, select_result *res,TableList *tables,
114
114
                            List<Item> &fields, bool send_row,
115
115
                            uint64_t select_options, const char *info,
1465
1465
  /* Optimize distinct away if possible */
1466
1466
  {
1467
1467
    order_st *org_order= order;
1468
 
    order=remove_const(this, order,conds,1, &simple_order);
 
1468
    order=remove_constants(this, order,conds,1, &simple_order);
1469
1469
    if (session->is_error())
1470
1470
    {
1471
1471
      error= 1;
1602
1602
  simple_group= 0;
1603
1603
  {
1604
1604
    order_st *old_group_list;
1605
 
    group_list= remove_const(this, (old_group_list= group_list), conds,
1606
 
                             rollup.state == ROLLUP::STATE_NONE,
1607
 
                             &simple_group);
 
1605
    group_list= remove_constants(this, (old_group_list= group_list), conds,
 
1606
                                 rollup.state == ROLLUP::STATE_NONE,
 
1607
                                 &simple_group);
1608
1608
    if (session->is_error())
1609
1609
    {
1610
1610
      error= 1;
8273
8273
*/
8274
8274
 
8275
8275
static order_st *
8276
 
remove_const(JOIN *join,order_st *first_order, COND *cond,
8277
 
             bool change_list, bool *simple_order)
 
8276
remove_constants(JOIN *join,order_st *first_order, COND *cond,
 
8277
                 bool change_list, bool *simple_order)
8278
8278
{
8279
8279
  if (join->tables == join->const_tables)
8280
8280
    return change_list ? 0 : first_order;               // No need to sort