← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/numhybrid.cc

  • Committer: Brian Aker
  • Date: 2010-12-27 23:56:33 UTC
  • mfrom: (2034.2.5 clean)
  • Revision ID: brian@tangent.org-20101227235633-9wwf7j35lkf0g262
Merge in additional encapsulation of Decimal

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/numhybrid.cc
117
117
      if (!(val= decimal_op(&decimal_value)))
118
118
        return 0;                                 // null is set
119
119
      int64_t result;
120
 
      class_decimal2int(E_DEC_FATAL_ERROR, val, unsigned_flag, &result);
 
120
      val->val_int32(E_DEC_FATAL_ERROR, unsigned_flag, &result);
121
121
      return result;
122
122
    }
123
123
  case INT_RESULT:
169
169
      if (!(res= str_op(&str_value)))
170
170
        return NULL;
171
171
 
172
 
      str2_class_decimal(E_DEC_FATAL_ERROR, (char*) res->ptr(),
173
 
                     res->length(), res->charset(), decimal_value);
 
172
      decimal_value->store(E_DEC_FATAL_ERROR, (char*) res->ptr(),
 
173
                           res->length(), res->charset());
174
174
      break;
175
175
    }
176
176
  case ROW_RESULT: