← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

  • Committer: Lee Bieber
  • Date: 2011-02-09 15:43:21 UTC
  • mfrom: (2151.1.3 build)
  • Revision ID: kalebral@gmail.com-20110209154321-bqrvjfgh4f6o3hm6
Merge Lee - update valgrind suppressions on 32bit machines
Merge Olaf - macro functions should be c++ template functions
Merge Lee - 714638: [user_locks plugin] Compilation aborts on FreeBSD 8.1 after complaining about overloaded abs function

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
4482
4482
  Item_bool_func2::cleanup();
4483
4483
}
4484
4484
 
 
4485
static unsigned char likeconv(const CHARSET_INFO *cs, unsigned char a)
 
4486
{
4485
4487
#ifdef LIKE_CMP_TOUPPER
4486
 
#define likeconv(cs,A) (unsigned char) (cs)->toupper(A)
 
4488
  return cs->toupper(a);
4487
4489
#else
4488
 
#define likeconv(cs,A) (unsigned char) (cs)->sort_order[(unsigned char) (A)]
 
4490
  return cs->sort_order[a];
4489
4491
#endif
4490
 
 
 
4492
}
4491
4493
 
4492
4494
/**
4493
4495
  Precomputation dependent only on pattern_len.