← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cached_item.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cached_item.cc
48
48
    Field *cached_field= real_item->field;
49
49
    return new Cached_item_field(cached_field);
50
50
  }
51
 
 
52
51
  switch (item->result_type()) {
53
52
  case STRING_RESULT:
54
53
    return new Cached_item_str(session, (Item_field *) item);
59
58
  case DECIMAL_RESULT:
60
59
    return new Cached_item_decimal(item);
61
60
  case ROW_RESULT:
 
61
  default:
62
62
    assert(0);
63
63
    return 0;
64
64
  }
65
 
 
66
 
  abort();
67
65
}
68
66
 
69
67
Cached_item::~Cached_item() {}
148
146
bool Cached_item_field::cmp(void)
149
147
{
150
148
  // This is not a blob!
151
 
  bool tmp= field->cmp_internal(buff) != 0;
 
149
  bool tmp= field->cmp(buff) != 0;
152
150
 
153
151
  if (tmp)
154
152
    field->get_image(buff,length,field->charset());