← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
35
35
#include <math.h>
36
36
#include <algorithm>
37
37
 
38
 
using namespace drizzled;
39
38
using namespace std;
40
39
 
 
40
namespace drizzled
 
41
{
 
42
 
41
43
extern const double log_10[309];
42
44
 
43
45
static Eq_creator eq_creator;
817
819
      String *str_val;
818
820
      String tmp;
819
821
      /* DateTime used to pick up as many string conversion possibilities as possible. */
820
 
      drizzled::DateTime temporal;
 
822
      DateTime temporal;
821
823
 
822
824
      str_val= str_arg->val_str(&tmp);
823
825
      if (! str_val)
3064
3066
 
3065
3067
void in_vector::sort()
3066
3068
{
3067
 
  my_qsort2(base,used_count,size,compare, (void *) collation);
 
3069
  internal::my_qsort2(base,used_count,size,compare, (void *) collation);
3068
3070
}
3069
3071
 
3070
3072
 
4355
4357
                    res->ptr(),res->ptr()+res->length(),
4356
4358
                    res2->ptr(),res2->ptr()+res2->length(),
4357
4359
                    make_escape_code(cmp.cmp_collation.collation, escape),
4358
 
                    wild_one,wild_many) ? 0 : 1;
 
4360
                    internal::wild_one,internal::wild_many) ? 0 : 1;
4359
4361
}
4360
4362
 
4361
4363
 
4372
4374
    if (!res2)
4373
4375
      return OPTIMIZE_NONE;
4374
4376
 
4375
 
    if (*res2->ptr() != wild_many)
 
4377
    if (*res2->ptr() != internal::wild_many)
4376
4378
    {
4377
 
      if (args[0]->result_type() != STRING_RESULT || *res2->ptr() != wild_one)
 
4379
      if (args[0]->result_type() != STRING_RESULT || *res2->ptr() != internal::wild_one)
4378
4380
        return OPTIMIZE_OP;
4379
4381
    }
4380
4382
  }
4430
4432
      */
4431
4433
 
4432
4434
      if (len > MIN_TURBOBM_PATTERN_LEN + 2 &&
4433
 
          *first == wild_many &&
4434
 
          *last  == wild_many)
 
4435
          *first == internal::wild_many &&
 
4436
          *last  == internal::wild_many)
4435
4437
      {
4436
4438
        const char* tmp = first + 1;
4437
 
        for (; *tmp != wild_many && *tmp != wild_one; tmp++)
 
4439
        for (; *tmp != internal::wild_many && *tmp != internal::wild_one; tmp++)
4438
4440
        {
4439
4441
          if (escape == tmp)
4440
4442
            break;
5169
5171
  str->append(')');
5170
5172
}
5171
5173
 
 
5174
} /* namespace drizzled */