← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cache_str.cc

  • Committer: Brian Aker
  • Date: 2010-10-20 20:26:18 UTC
  • mfrom: (1859.2.13 refactor)
  • Revision ID: brian@tangent.org-20101020202618-9222n39lm329urv5
Merge for Brian 

Show diffs side-by-side

added added

removed removed

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