← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/num.cc

Merged Nathan from lp:~nlws/drizzle/fix-string-c-ptr-overrun

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/num.cc
110
110
*/
111
111
 
112
112
bool Field_num::get_int(const CHARSET_INFO * const cs, const char *from, uint32_t len,
113
 
                        int64_t *rnd, uint64_t unsigned_max __attribute__((unused)),
 
113
                        int64_t *rnd, uint64_t ,
114
114
                        int64_t signed_min, int64_t signed_max)
115
115
{
116
116
  char *end;
203
203
  return 1;
204
204
}
205
205
 
206
 
uint32_t Field_num::is_equal(Create_field *new_field)
 
206
uint32_t Field_num::is_equal(Create_field *new_field_ptr)
207
207
{
208
 
  return ((new_field->sql_type == real_type()) &&
209
 
          ((new_field->flags & UNSIGNED_FLAG) == (uint32_t) (flags &
210
 
                                                         UNSIGNED_FLAG)) &&
211
 
          ((new_field->flags & AUTO_INCREMENT_FLAG) ==
 
208
  return ((new_field_ptr->sql_type == real_type()) &&
 
209
          ((new_field_ptr->flags & UNSIGNED_FLAG) ==
 
210
           (uint32_t) (flags & UNSIGNED_FLAG)) &&
 
211
          ((new_field_ptr->flags & AUTO_INCREMENT_FLAG) ==
212
212
           (uint32_t) (flags & AUTO_INCREMENT_FLAG)) &&
213
 
          (new_field->length <= max_display_length()));
 
213
          (new_field_ptr->length <= max_display_length()));
214
214
}
215
215
 
216
216