← Back to branch summary

~hartmut-php/drizzle/codestyle

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.cc

  • Committer: Monty Taylor
  • Date: 2008-08-10 16:52:18 UTC
  • mfrom: (293 drizzle)
  • mto: (312.1.3 translations)
  • mto: This revision was merged to the branch mainline in revision 295.
  • Revision ID: monty@inaugust.com-20080810165218-jlekj1n46oyx9sih
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.cc
249
249
{
250
250
  THD *thd= table->in_use;
251
251
  const CHARSET_INFO * const cs=res.charset();
252
 
  ulong length;
 
252
  uint32_t length;
253
253
 
254
254
  length= cs->cset->snprintf(cs,(char*) res.ptr(),
255
255
                             res.alloced_length(), "%s(%d)",
593
593
}
594
594
 
595
595
 
596
 
void Field_varstring::hash(ulong *nr, ulong *nr2)
 
596
void Field_varstring::hash(uint32_t *nr, uint32_t *nr2)
597
597
{
598
598
  if (is_null())
599
599
  {
601
601
  }
602
602
  else
603
603
  {
604
 
    uint len=  length_bytes == 1 ? (uint) *ptr : uint2korr(ptr);
 
604
    uint32_t len=  length_bytes == 1 ? (uint) *ptr : uint2korr(ptr);
605
605
    const CHARSET_INFO * const cs= charset();
606
606
    cs->coll->hash_sort(cs, ptr + length_bytes, len, nr, nr2);
607
607
  }