← 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-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/sql_select.cc
2401
2401
    if (tmp)
2402
2402
    {
2403
2403
      tmp->collation.set(right_item->collation);
2404
 
      session->change_item_tree(args + 1, tmp);
 
2404
      args[1]= tmp;
2405
2405
      func->update_used_tables();
2406
2406
      if ((functype == Item_func::EQ_FUNC || functype == Item_func::EQUAL_FUNC) &&
2407
2407
                and_father != cond && 
2423
2423
    if (tmp)
2424
2424
    {
2425
2425
      tmp->collation.set(left_item->collation);
2426
 
      session->change_item_tree(args, tmp);
 
2426
      *args= tmp;
2427
2427
      value= tmp;
2428
2428
      func->update_used_tables();
2429
2429
      if ((functype == Item_func::EQ_FUNC || functype == Item_func::EQUAL_FUNC) &&
2431
2431
          ! right_item->const_item())
2432
2432
      {
2433
2433
        args[0]= args[1];                       // For easy check
2434
 
        session->change_item_tree(args + 1, value);
 
2434
        args[1]= value;
2435
2435
        cond->marker=1;
2436
2436
        save_list.push_back( COND_CMP(and_father, func) );
2437
2437
      }
6231
6231
            if (!(new_item= new Item_ref(context, group_tmp->item, 0,
6232
6232
                                        item->name)))
6233
6233
              return 1;                                 // fatal_error is set
6234
 
            session->change_item_tree(arg, new_item);
 
6234
            *arg= new_item;
6235
6235
            arg_changed= true;
6236
6236
          }
6237
6237
        }