← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
597
597
  STRING_RESULT,
598
598
};
599
599
 
600
 
bool test_if_important_data(const CHARSET_INFO * const cs, 
 
600
bool test_if_important_data(const charset_info_st * const cs, 
601
601
                            const char *str,
602
602
                            const char *strend)
603
603
{
860
860
  else
861
861
  {
862
862
    uint32_t len= pack_length();
863
 
    const CHARSET_INFO * const cs= charset();
 
863
    const charset_info_st * const cs= charset();
864
864
    cs->coll->hash_sort(cs, ptr, len, nr, nr2);
865
865
  }
866
866
}
880
880
int Field::store_and_check(enum_check_fields check_level,
881
881
                           const char *to, 
882
882
                           uint32_t length,
883
 
                           const CHARSET_INFO * const cs)
 
883
                           const charset_info_st * const cs)
884
884
 
885
885
{
886
886
  int res;