← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

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) const
 
127
double Field_varstring::val_real(void)
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) const
 
141
int64_t Field_varstring::val_int(void)
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 *, String *val_ptr) const
 
155
String *Field_varstring::val_str(String *,
 
156
                                 String *val_ptr)
156
157
{
157
158
  uint32_t length=  length_bytes == 1 ? (uint32_t) *ptr : uint2korr(ptr);
158
159
 
164
165
}
165
166
 
166
167
 
167
 
type::Decimal *Field_varstring::val_decimal(type::Decimal *decimal_value) const
 
168
type::Decimal *Field_varstring::val_decimal(type::Decimal *decimal_value)
168
169
{
169
170
  uint32_t length;
170
171