← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/field/string.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/field/string.cc
85
85
  
86
86
  result=  my_strntod(cs,(char*) ptr,field_length,&end,&error);
87
87
  if (!table->in_use->no_errors &&
88
 
      (error || (field_length != (uint32)(end - (char*) ptr) && 
 
88
      (error || (field_length != (uint32_t)(end - (char*) ptr) && 
89
89
                 !check_if_only_end_space(cs, end,
90
90
                                          (char*) ptr + field_length))))
91
91
  {
110
110
 
111
111
  result= my_strntoll(cs, (char*) ptr,field_length,10,&end,&error);
112
112
  if (!table->in_use->no_errors &&
113
 
      (error || (field_length != (uint32)(end - (char*) ptr) && 
 
113
      (error || (field_length != (uint32_t)(end - (char*) ptr) && 
114
114
                 !check_if_only_end_space(cs, end,
115
115
                                          (char*) ptr + field_length))))
116
116
  {