← 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-02-23 17:17:54 UTC
  • mfrom: (2194.1.3 build)
  • Revision ID: kalebral@gmail.com-20110223171754-5g62btbvgtzsev3n
Merge Stewart - 676770: Error log logging 'Sort aborted' messages when DML fails with ER_INVALID_ENUM_VALUE     
Merge Olaf - Use Item_equal::begin() and Use List::size()
Merge Olaf - Delete drizzled/strfunc.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
2141
2141
  if (((Item *) item_equal)->const_item() && !item_equal->val_int())
2142
2142
    return new Item_int((int64_t) 0,1);
2143
2143
  Item *item_const= item_equal->get_const();
2144
 
  Item_equal_iterator it(*item_equal);
 
2144
  Item_equal_iterator it(item_equal->begin());
2145
2145
  Item *head;
2146
2146
  if (item_const)
2147
2147
    head= item_const;
2161
2161
        item= 0;
2162
2162
      else
2163
2163
      {
2164
 
        Item_equal_iterator li(*item_equal);
 
2164
        Item_equal_iterator li(item_equal->begin());
2165
2165
        while ((item= li++) != item_field)
2166
2166
        {
2167
2167
          if (item->find_item_equal(upper_levels) == upper)
2333
2333
    if (!contained_const && item_equal->get_const())
2334
2334
    {
2335
2335
      /* Update keys for range analysis */
2336
 
      Item_equal_iterator it(*item_equal);
 
2336
      Item_equal_iterator it(item_equal->begin());
2337
2337
      Item_field *item_field;
2338
2338
      while ((item_field= it++))
2339
2339
      {