← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.cc
19
19
 */
20
20
 
21
21
 
22
 
#include "config.h"
 
22
#include <config.h>
23
23
#include <drizzled/field/varstring.h>
24
24
#include <drizzled/table.h>
25
25
#include <drizzled/session.h>
26
 
#include "plugin/myisam/myisam.h"
 
26
#include <plugin/myisam/myisam.h>
27
27
 
28
28
#include <string>
29
29
 
124
124
}
125
125
 
126
126
 
127
 
double Field_varstring::val_real(void)
 
127
double Field_varstring::val_real(void) const
128
128
{
129
129
  int not_used;
130
130
  char *end_not_used;
138
138
}
139
139
 
140
140
 
141
 
int64_t Field_varstring::val_int(void)
 
141
int64_t Field_varstring::val_int(void) const
142
142
{
143
143
  int not_used;
144
144
  char *end_not_used;
152
152
                     &end_not_used, &not_used);
153
153
}
154
154
 
155
 
String *Field_varstring::val_str(String *,
156
 
                                 String *val_ptr)
 
155
String *Field_varstring::val_str(String *, String *val_ptr) const
157
156
{
158
157
  uint32_t length=  length_bytes == 1 ? (uint32_t) *ptr : uint2korr(ptr);
159
158
 
165
164
}
166
165
 
167
166
 
168
 
my_decimal *Field_varstring::val_decimal(my_decimal *decimal_value)
 
167
type::Decimal *Field_varstring::val_decimal(type::Decimal *decimal_value) const
169
168
{
170
169
  uint32_t length;
171
170
 
173
172
 
174
173
  length= length_bytes == 1 ? (uint32_t) *ptr : uint2korr(ptr);
175
174
 
176
 
  str2my_decimal(E_DEC_FATAL_ERROR, (char*) ptr+length_bytes, length,
177
 
                 charset(), decimal_value);
 
175
  decimal_value->store(E_DEC_FATAL_ERROR, (char*) ptr+length_bytes, length, charset());
 
176
 
178
177
  return decimal_value;
179
178
}
180
179