← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.cc

  • Committer: Brian Aker
  • Date: 2009-02-21 00:18:15 UTC
  • Revision ID: brian@tangent.org-20090221001815-x20e8h71e984lvs1
Completion (?) of uint conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.cc
111
111
    {
112
112
      /* This is for reading numbers with LOAD DATA INFILE */
113
113
      char *end;
114
 
      tmp=(uint) my_strntoul(cs,from,length,10,&end,&err);
 
114
      tmp=(uint32_t) my_strntoul(cs,from,length,10,&end,&err);
115
115
      if (err || end != from+length || tmp > typelib->count)
116
116
      {
117
117
        tmp=0;
147
147
      error= 1;
148
148
    }
149
149
  }
150
 
  store_type((uint64_t) (uint) nr);
 
150
  store_type((uint64_t) (uint32_t) nr);
151
151
  return error;
152
152
}
153
153
 
225
225
String *Field_enum::val_str(String *,
226
226
                            String *val_ptr)
227
227
{
228
 
  uint32_t tmp=(uint) Field_enum::val_int();
 
228
  uint32_t tmp=(uint32_t) Field_enum::val_int();
229
229
  if (!tmp || tmp > typelib->count)
230
230
    val_ptr->set("", 0, field_charset);
231
231
  else