← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cache_str.cc

  • Committer: Lee Bieber
  • Date: 2011-02-23 23:22:48 UTC
  • mfrom: (2183.2.20 list2)
  • mto: This revision was merged to the branch mainline in revision 2197.
  • Revision ID: kalebral@gmail.com-20110223232248-ev4y8pyt16b806o0
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cache_str.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/item/cache_str.h>
 
23
#include <drizzled/field.h>
23
24
 
24
25
namespace drizzled
25
26
{
76
77
    return (int64_t)0;
77
78
}
78
79
 
79
 
my_decimal *Item_cache_str::val_decimal(my_decimal *decimal_val)
 
80
type::Decimal *Item_cache_str::val_decimal(type::Decimal *decimal_val)
80
81
{
81
82
  assert(fixed == 1);
82
83
  if (value)
83
 
    string2my_decimal(E_DEC_FATAL_ERROR, value, decimal_val);
 
84
    decimal_val->store(E_DEC_FATAL_ERROR, value);
84
85
  else
85
86
    decimal_val= 0;
86
87
  return decimal_val;