← 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-10-25 19:08:35 UTC
  • mfrom: (2445.1.6 rf)
  • Revision ID: me@mark.atwood.name-20111025190835-g21cn911ypxjd5fi
merge lp:~olafvdspek/drizzle/refactor7

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
4388
4388
  return my_wildcmp(cmp.cmp_collation.collation,
4389
4389
                    res->ptr(),res->ptr()+res->length(),
4390
4390
                    res2->ptr(),res2->ptr()+res2->length(),
4391
 
                    make_escape_code(cmp.cmp_collation.collation, escape),
4392
 
                    internal::wild_one,internal::wild_many) ? 0 : 1;
 
4391
                    make_escape_code(cmp.cmp_collation.collation, escape), internal::wild_one,internal::wild_many) ? 0 : 1;
4393
4392
}
4394
4393
 
4395
4394
 
4449
4448
      We could also do boyer-more for non-const items, but as we would have to
4450
4449
      recompute the tables for each row it's not worth it.
4451
4450
    */
4452
 
    if (args[1]->const_item() && !use_strnxfrm(collation.collation))
 
4451
    if (args[1]->const_item() && not collation.collation->use_strnxfrm())
4453
4452
    {
4454
4453
      String* res2 = args[1]->val_str(&tmp_value2);
4455
4454
      if (!res2)