← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merged from Toru - removal of my_time_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/math/plus.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
21
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
22
22
#include <drizzled/function/math/plus.h>
23
23
 
24
 
namespace drizzled
25
 
{
26
 
 
27
24
double Item_func_plus::real_op()
28
25
{
29
26
  double value= args[0]->val_real() + args[1]->val_real();
53
50
    \# Value of operation as a decimal
54
51
*/
55
52
 
56
 
type::Decimal *Item_func_plus::decimal_op(type::Decimal *decimal_value)
 
53
my_decimal *Item_func_plus::decimal_op(my_decimal *decimal_value)
57
54
{
58
 
  type::Decimal value1, *val1;
59
 
  type::Decimal value2, *val2;
 
55
  my_decimal value1, *val1;
 
56
  my_decimal value2, *val2;
60
57
  val1= args[0]->val_decimal(&value1);
61
58
  if ((null_value= args[0]->null_value))
62
59
    return 0;
63
60
  val2= args[1]->val_decimal(&value2);
64
61
  if (!(null_value= (args[1]->null_value ||
65
 
                     (class_decimal_add(E_DEC_FATAL_ERROR, decimal_value, val1,
 
62
                     (my_decimal_add(E_DEC_FATAL_ERROR, decimal_value, val1,
66
63
                                     val2) > 3))))
67
64
    return decimal_value;
68
65
  return 0;
69
66
}
70
 
 
71
 
} /* namespace drizzled */