← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_func.cc

Merged from PatG.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_func.cc
2195
2195
    if (args[i]->result_type() != ROW_RESULT && args[i]->is_datetime())
2196
2196
    {
2197
2197
      datetime_found= true;
2198
 
      if (!datetime_item || args[i]->field_type() == FIELD_TYPE_DATETIME)
 
2198
      if (!datetime_item || args[i]->field_type() == DRIZZLE_TYPE_DATETIME)
2199
2199
        datetime_item= args[i];
2200
2200
    }
2201
2201
  }
2254
2254
  if (value)
2255
2255
  {
2256
2256
    *value= min_max;
2257
 
    if (datetime_item->field_type() == FIELD_TYPE_NEWDATE)
 
2257
    if (datetime_item->field_type() == DRIZZLE_TYPE_NEWDATE)
2258
2258
      *value/= 1000000L;
2259
2259
  }
2260
2260
  return min_max_idx;
2646
2646
  if (args[0]->const_item() && args[1]->type() == FIELD_ITEM)
2647
2647
  {
2648
2648
    Field *field= ((Item_field*) args[1])->field;
2649
 
    if (field->real_type() == FIELD_TYPE_SET)
 
2649
    if (field->real_type() == DRIZZLE_TYPE_SET)
2650
2650
    {
2651
2651
      String *find=args[0]->val_str(&value);
2652
2652
      if (find)