← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/copy_string.cc

  • Committer: Brian Aker
  • Date: 2010-08-09 18:04:12 UTC
  • mfrom: (1689.3.7 staging)
  • Revision ID: brian@gaz-20100809180412-olurwh51ojllev6p
Merge in heap conversion, and case insensitive patch, and remove need for
M_HASH in session.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/copy_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
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
 
#include <drizzled/type/decimal.h>
23
22
#include <drizzled/item/copy_string.h>
24
23
 
25
24
namespace drizzled
43
42
}
44
43
 
45
44
 
46
 
type::Decimal *Item_copy_string::val_decimal(type::Decimal *decimal_value)
 
45
my_decimal *Item_copy_string::val_decimal(my_decimal *decimal_value)
47
46
{
48
47
  // Item_copy_string is used without fix_fields call
49
48
  if (null_value)
50
49
    return 0;
51
 
  decimal_value->store(E_DEC_FATAL_ERROR, &str_value);
52
 
 
 
50
  string2my_decimal(E_DEC_FATAL_ERROR, &str_value, decimal_value);
53
51
  return (decimal_value);
54
52
}
55
53