← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/hex_string.cc

  • Committer: Lee Bieber
  • Date: 2010-11-14 23:15:42 UTC
  • mfrom: (1929.1.42 warning-stack-frame)
  • Revision ID: kalebral@gmail.com-20101114231542-fnnu6ydd2p17n582
Merge Monty - fix bug 672372: some functions use > 32k stack

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/hex_string.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
20
20
#include "config.h"
21
21
 
22
22
#include <drizzled/error.h>
23
 
#include <drizzled/field.h>
 
23
#include <drizzled/item/string.h>
24
24
#include <drizzled/item/hex_string.h>
25
 
#include <drizzled/item/string.h>
26
 
#include <drizzled/type/decimal.h>
27
25
 
28
26
#include <algorithm>
29
27
 
77
75
}
78
76
 
79
77
 
80
 
type::Decimal *Item_hex_string::val_decimal(type::Decimal *decimal_value)
 
78
my_decimal *Item_hex_string::val_decimal(my_decimal *decimal_value)
81
79
{
82
80
  // following assert is redundant, because fixed=1 assigned in constructor
83
81
  assert(fixed == 1);
84
82
  uint64_t value= (uint64_t)val_int();
85
 
  int2_class_decimal(E_DEC_FATAL_ERROR, value, true, decimal_value);
 
83
  int2my_decimal(E_DEC_FATAL_ERROR, value, true, decimal_value);
86
84
  return (decimal_value);
87
85
}
88
86