← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

  • Committer: Mark Atwood
  • Date: 2011-06-27 19:01:37 UTC
  • mfrom: (2318.6.90 refactor16)
  • Revision ID: me@mark.atwood.name-20110627190137-iflt3vku0kw77l8a
merge lp:~olafvdspek/drizzle/refactor17

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
603
603
        comparators= 0;
604
604
        return 1;
605
605
      }
606
 
      if (!(comparators= new Arg_comparator[n]))
607
 
        return 1;
 
606
      comparators= new Arg_comparator[n];
608
607
      for (uint32_t i=0; i < n; i++)
609
608
      {
610
609
        if ((*a)->element_index(i)->cols() != (*b)->element_index(i)->cols())
3630
3629
      }
3631
3630
      else
3632
3631
      {
3633
 
        if (!(cmp= new cmp_item_row))
3634
 
          return;
 
3632
        cmp= new cmp_item_row;
3635
3633
        cmp_items[ROW_RESULT]= cmp;
3636
3634
      }
3637
3635
      cmp->n= args[0]->cols();
4196
4194
  {
4197
4195
    Item *new_item= item->neg_transformer(session);
4198
4196
    if (!new_item)
4199
 
    {
4200
 
      if (!(new_item= new Item_func_not(item)))
4201
 
        return;                                 // Fatal OEM error
4202
 
    }
 
4197
      new_item= new Item_func_not(item);
4203
4198
    li.replace(new_item);
4204
4199
  }
4205
4200
}
4289
4284
  if (a == *org_item)
4290
4285
  {
4291
4286
    Item_cond *res;
4292
 
    if ((res= new Item_cond_and(a, (Item*) b)))
4293
 
    {
4294
 
      res->used_tables_cache= a->used_tables() | b->used_tables();
4295
 
      res->not_null_tables_cache= a->not_null_tables() | b->not_null_tables();
4296
 
    }
 
4287
    res= new Item_cond_and(a, (Item*) b);
 
4288
    res->used_tables_cache= a->used_tables() | b->used_tables();
 
4289
    res->not_null_tables_cache= a->not_null_tables() | b->not_null_tables();
4297
4290
    return res;
4298
4291
  }
4299
4292
  ((Item_cond_and*) a)->add((Item*) b);