← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/numhybrid.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-09-17 00:08:20 UTC
  • mto: (1126.9.3 captain-20090915-01)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: osullivan.padraig@gmail.com-20090917000820-urd6p46qngi1okjp
Updated calls to some dtrace probes to cast the parameter to const char *
appropriately. Also, removed the additional variable in places that I was
using.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/numhybrid.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
#include <math.h>
 
20
#include <drizzled/server_includes.h>
22
21
#include <drizzled/function/numhybrid.h>
23
22
 
24
 
namespace drizzled
25
 
{
26
 
 
27
23
void Item_func_numhybrid::fix_num_length_and_dec()
28
24
{}
29
25
 
50
46
  {
51
47
    int64_t nr= int_op();
52
48
    if (null_value)
53
 
      return 0;
 
49
      return 0; /* purecov: inspected */
54
50
    str->set_int(nr, unsigned_flag, &my_charset_bin);
55
51
    break;
56
52
  }
58
54
  {
59
55
    double nr= real_op();
60
56
    if (null_value)
61
 
      return 0;
 
57
      return 0; /* purecov: inspected */
62
58
    str->set_real(nr,decimals,&my_charset_bin);
63
59
    break;
64
60
  }
177
173
  }
178
174
  return val;
179
175
}
180
 
 
181
 
} /* namespace drizzled */