← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/int64.cc

merge lp:~linuxjedi/drizzle/trunk-remove-drizzleadmin

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/int64.cc
19
19
 */
20
20
 
21
21
 
22
 
#include "config.h"
 
22
#include <config.h>
23
23
#include <drizzled/field/int64.h>
24
24
#include <drizzled/error.h>
25
25
#include <drizzled/table.h>
26
26
#include <drizzled/session.h>
27
 
#include "drizzled/internal/my_sys.h"
 
27
#include <drizzled/internal/my_sys.h>
28
28
 
29
29
#include <math.h>
30
30
 
42
42
  Field type Int64 int (8 bytes)
43
43
 ****************************************************************************/
44
44
 
45
 
int Int64::store(const char *from,uint32_t len, const CHARSET_INFO * const cs)
 
45
int Int64::store(const char *from,uint32_t len, const charset_info_st * const cs)
46
46
{
47
47
  int error= 0;
48
48
  char *end;
51
51
  ASSERT_COLUMN_MARKED_FOR_WRITE;
52
52
 
53
53
  tmp= cs->cset->strntoull10rnd(cs, from, len, false, &end,&error);
54
 
  if (error == MY_ERRNO_ERANGE)
 
54
  if (error == ERANGE)
55
55
  {
56
56
    set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
57
57
    error= 1;
121
121
}
122
122
 
123
123
 
124
 
double Int64::val_real(void)
 
124
double Int64::val_real(void) const
125
125
{
126
126
  int64_t j;
127
127
 
134
134
}
135
135
 
136
136
 
137
 
int64_t Int64::val_int(void)
 
137
int64_t Int64::val_int(void) const
138
138
{
139
139
  int64_t j;
140
140
 
146
146
}
147
147
 
148
148
 
149
 
String *Int64::val_str(String *val_buffer, String *)
 
149
String *Int64::val_str(String *val_buffer, String *) const
150
150
{
151
 
  const CHARSET_INFO * const cs= &my_charset_bin;
 
151
  const charset_info_st * const cs= &my_charset_bin;
152
152
  uint32_t length;
153
153
  uint32_t mlength= max(field_length+1,22*cs->mbmaxlen);
154
154
  val_buffer->alloc(mlength);
205
205
 
206
206
void Int64::sql_type(String &res) const
207
207
{
208
 
  const CHARSET_INFO * const cs=res.charset();
 
208
  const charset_info_st * const cs=res.charset();
209
209
  res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), "bigint"));
210
210
}
211
211