← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Lee Bieber
  • Date: 2011-02-28 23:00:55 UTC
  • mfrom: (2208.1.4 build)
  • Revision ID: kalebral@gmail.com-20110228230055-g9cq8faquzm5cvpi
Merge Olaf - Remove Session::change_item_tree
Merge Shrew/Joe - 720908: slave will not reconnect if initial connection to master is unsuccessful
Merge Shrews - 723923: Make sleep intervals for slave plugin configurable
Merge Patrck - 726784: dbqp not properly resetting itself after a test failure 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2325
2325
          if (!new_item)
2326
2326
            return 1;
2327
2327
          new_item->fix_fields(session, (Item **) 0);
2328
 
          session->change_item_tree(it.ref(), new_item);
 
2328
          *it.ref()= new_item;
2329
2329
          for (Order *tmp= group_tmp; tmp; tmp= tmp->next)
2330
2330
          {
2331
2331
            if (*tmp->item == item)
2332
 
              session->change_item_tree(tmp->item, new_item);
 
2332
              *tmp->item= new_item;
2333
2333
          }
2334
2334
        }
2335
2335
      }