← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-10-27 21:00:49 UTC
  • mto: This revision was merged to the branch mainline in revision 1886.
  • Revision ID: brian@tangent.org-20101027210049-zfpgx2cfbrh8maq9
A couple of fixes to documentation.

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
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;