← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.h

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.h
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
21
21
#define DRIZZLED_ITEM_STRING_H
22
22
 
23
23
#include <drizzled/item/basic_constant.h>
24
 
#include <drizzled/charset_info.h>
25
24
 
26
25
namespace drizzled
27
26
{
78
77
    assert(fixed == 1);
79
78
    return (String*) &str_value;
80
79
  }
81
 
  type::Decimal *val_decimal(type::Decimal *);
 
80
  my_decimal *val_decimal(my_decimal *);
82
81
  int save_in_field(Field *field, bool no_conversions);
83
82
  enum Item_result result_type () const { return STRING_RESULT; }
84
83
  enum_field_types field_type() const { return DRIZZLE_TYPE_VARCHAR; }