← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.cc

  • Committer: Brian Aker
  • Date: 2009-01-28 19:37:25 UTC
  • mfrom: (779.3.11 devel)
  • Revision ID: brian@tangent.org-20090128193725-pz7g7dnp2dx0863e
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.cc
87
87
*/
88
88
int Field_varstring::do_save_field_metadata(unsigned char *metadata_ptr)
89
89
{
90
 
  char *ptr= (char *)metadata_ptr;
91
90
  assert(field_length <= 65535);
92
 
  int2store(ptr, field_length);
 
91
  int2store(metadata_ptr, field_length);
93
92
  return 2;
94
93
}
95
94
 
630
629
}
631
630
 
632
631
 
633
 
uint32_t Field_varstring::is_equal(Create_field *new_field)
 
632
uint32_t Field_varstring::is_equal(Create_field *new_field_ptr)
634
633
{
635
 
  if (new_field->sql_type == real_type() &&
636
 
      new_field->charset == field_charset)
 
634
  if (new_field_ptr->sql_type == real_type() &&
 
635
      new_field_ptr->charset == field_charset)
637
636
  {
638
 
    if (new_field->length == max_display_length())
 
637
    if (new_field_ptr->length == max_display_length())
639
638
      return IS_EQUAL_YES;
640
 
    if (new_field->length > max_display_length() &&
641
 
        ((new_field->length <= 255 && max_display_length() <= 255) ||
642
 
         (new_field->length > 255 && max_display_length() > 255)))
 
639
    if (new_field_ptr->length > max_display_length() &&
 
640
        ((new_field_ptr->length <= 255 && max_display_length() <= 255) ||
 
641
         (new_field_ptr->length > 255 && max_display_length() > 255)))
643
642
      return IS_EQUAL_PACK_LENGTH; // VARCHAR, longer variable length
644
643
  }
645
644
  return IS_EQUAL_NO;