← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Lee Bieber
  • Date: 2011-01-28 02:32:26 UTC
  • mfrom: (2114.4.10 alter-table)
  • mto: This revision was merged to the branch mainline in revision 2124.
  • Revision ID: kalebral@gmail.com-20110128023226-11i88kemmdygtz0d
Merge Brian - more parser rework

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
5464
5464
    if (!count || count > fields.elements)
5465
5465
    {
5466
5466
      my_error(ER_BAD_FIELD_ERROR, MYF(0),
5467
 
               order_item->full_name(), session->where);
 
5467
               order_item->full_name(), session->where());
5468
5468
      return true;
5469
5469
    }
5470
5470
    order->item= ref_pointer_array + count - 1;
5541
5541
      push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_NON_UNIQ_ERROR,
5542
5542
                          ER(ER_NON_UNIQ_ERROR),
5543
5543
                          ((Item_ident*) order_item)->field_name,
5544
 
                          session->where);
 
5544
                          session->where());
5545
5545
    }
5546
5546
  }
5547
5547
 
5583
5583
                List<Item> &all_fields,
5584
5584
                Order *order)
5585
5585
{
5586
 
  session->where="order clause";
 
5586
  session->setWhere("order clause");
5587
5587
  for (; order; order=order->next)
5588
5588
  {
5589
5589
    if (find_order_in_list(session, ref_pointer_array, tables, order, fields,
5634
5634
 
5635
5635
  uint32_t org_fields=all_fields.elements;
5636
5636
 
5637
 
  session->where="group statement";
 
5637
  session->setWhere("group statement");
5638
5638
  for (ord= order; ord; ord= ord->next)
5639
5639
  {
5640
5640
    if (find_order_in_list(session, ref_pointer_array, tables, ord, fields,