← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_conv.cc

  • Committer: Monty Taylor
  • Date: 2009-02-21 03:33:30 UTC
  • mfrom: (895 drizzle)
  • mto: (896.2.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 898.
  • Revision ID: mordred@inaugust.com-20090221033330-v110f94679dej04p
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_conv.cc
441
441
 
442
442
static void do_varstring1(Copy_field *copy)
443
443
{
444
 
  uint32_t length= (uint) *(unsigned char*) copy->from_ptr;
 
444
  uint32_t length= (uint32_t) *(unsigned char*) copy->from_ptr;
445
445
  if (length > copy->to_length- 1)
446
446
  {
447
447
    length=copy->to_length - 1;
458
458
{
459
459
  int well_formed_error;
460
460
  const CHARSET_INFO * const cs= copy->from_field->charset();
461
 
  uint32_t from_length= (uint) *(unsigned char*) copy->from_ptr;
 
461
  uint32_t from_length= (uint32_t) *(unsigned char*) copy->from_ptr;
462
462
  const unsigned char *from_ptr= copy->from_ptr + 1;
463
463
  uint32_t to_char_length= (copy->to_length - 1) / cs->mbmaxlen;
464
464
  uint32_t length= cs->cset->well_formed_len(cs, (char*) from_ptr,