← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/math/plus.cc

  • Committer: Monty Taylor
  • Date: 2010-12-27 18:39:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101227183911-atgh0kcubflay0b9
Added back INNOBASE_SKIP_WARNINGS for solaris. Also dealt with unused params.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/math/plus.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
22
#include <drizzled/function/math/plus.h>
23
23
 
53
53
    \# Value of operation as a decimal
54
54
*/
55
55
 
56
 
type::Decimal *Item_func_plus::decimal_op(type::Decimal *decimal_value)
 
56
my_decimal *Item_func_plus::decimal_op(my_decimal *decimal_value)
57
57
{
58
 
  type::Decimal value1, *val1;
59
 
  type::Decimal value2, *val2;
 
58
  my_decimal value1, *val1;
 
59
  my_decimal value2, *val2;
60
60
  val1= args[0]->val_decimal(&value1);
61
61
  if ((null_value= args[0]->null_value))
62
62
    return 0;
63
63
  val2= args[1]->val_decimal(&value2);
64
64
  if (!(null_value= (args[1]->null_value ||
65
 
                     (class_decimal_add(E_DEC_FATAL_ERROR, decimal_value, val1,
 
65
                     (my_decimal_add(E_DEC_FATAL_ERROR, decimal_value, val1,
66
66
                                     val2) > 3))))
67
67
    return decimal_value;
68
68
  return 0;