← 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-25 00:44:06 UTC
  • mto: This revision was merged to the branch mainline in revision 2031.
  • Revision ID: brian@tangent.org-20101225004406-4xna6p795yqkaony
Second pass through function names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/numhybrid.cc
43
43
      if (!(val= decimal_op(&decimal_value)))
44
44
        return 0;                                 // null is set
45
45
      class_decimal_round(E_DEC_FATAL_ERROR, val, decimals, false, val);
46
 
      my_decimal2string(E_DEC_FATAL_ERROR, val, 0, 0, 0, str);
 
46
      class_decimal2string(E_DEC_FATAL_ERROR, val, 0, 0, 0, str);
47
47
      break;
48
48
    }
49
49
  case INT_RESULT:
81
81
      double result;
82
82
      if (!(val= decimal_op(&decimal_value)))
83
83
        return 0.0;                               // null is set
84
 
      my_decimal2double(E_DEC_FATAL_ERROR, val, &result);
 
84
      class_decimal2double(E_DEC_FATAL_ERROR, val, &result);
85
85
      return result;
86
86
    }
87
87
  case INT_RESULT:
117
117
      if (!(val= decimal_op(&decimal_value)))
118
118
        return 0;                                 // null is set
119
119
      int64_t result;
120
 
      my_decimal2int(E_DEC_FATAL_ERROR, val, unsigned_flag, &result);
 
120
      class_decimal2int(E_DEC_FATAL_ERROR, val, unsigned_flag, &result);
121
121
      return result;
122
122
    }
123
123
  case INT_RESULT:
154
154
  case INT_RESULT:
155
155
    {
156
156
      int64_t result= int_op();
157
 
      int2my_decimal(E_DEC_FATAL_ERROR, result, unsigned_flag, decimal_value);
 
157
      int2_class_decimal(E_DEC_FATAL_ERROR, result, unsigned_flag, decimal_value);
158
158
      break;
159
159
    }
160
160
  case REAL_RESULT:
161
161
    {
162
162
      double result= (double)real_op();
163
 
      double2my_decimal(E_DEC_FATAL_ERROR, result, decimal_value);
 
163
      double2_class_decimal(E_DEC_FATAL_ERROR, result, decimal_value);
164
164
      break;
165
165
    }
166
166
  case STRING_RESULT:
169
169
      if (!(res= str_op(&str_value)))
170
170
        return NULL;
171
171
 
172
 
      str2my_decimal(E_DEC_FATAL_ERROR, (char*) res->ptr(),
 
172
      str2_class_decimal(E_DEC_FATAL_ERROR, (char*) res->ptr(),
173
173
                     res->length(), res->charset(), decimal_value);
174
174
      break;
175
175
    }