← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_conv.cc

Much closer toward UTF8 being around all the time...

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_conv.cc
370
370
{                                               // Shorter string field
371
371
  int well_formed_error;
372
372
  const CHARSET_INFO * const cs= copy->from_field->charset();
373
 
  const unsigned char *from_end= copy->from_ptr + copy->from_length;
374
 
  uint32_t copy_length= cs->cset->well_formed_len(cs,
 
373
  const uchar *from_end= copy->from_ptr + copy->from_length;
 
374
  uint copy_length= cs->cset->well_formed_len(cs,
375
375
                                              (char*) copy->from_ptr,
376
376
                                              (char*) from_end, 
377
377
                                              copy->to_length / cs->mbmaxlen,
419
419
 
420
420
static void do_varstring1(Copy_field *copy)
421
421
{
422
 
  uint32_t length= (uint) *(unsigned char*) copy->from_ptr;
 
422
  uint length= (uint) *(uchar*) copy->from_ptr;
423
423
  if (length > copy->to_length- 1)
424
424
  {
425
425
    length=copy->to_length - 1;
427
427
      copy->to_field->set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
428
428
                                  ER_WARN_DATA_TRUNCATED, 1);
429
429
  }
430
 
  *(unsigned char*) copy->to_ptr= (unsigned char) length;
 
430
  *(uchar*) copy->to_ptr= (uchar) length;
431
431
  memcpy(copy->to_ptr+1, copy->from_ptr + 1, length);
432
432
}
433
433
 
436
436
{
437
437
  int well_formed_error;
438
438
  const CHARSET_INFO * const cs= copy->from_field->charset();
439
 
  uint32_t from_length= (uint) *(unsigned char*) copy->from_ptr;
440
 
  const unsigned char *from_ptr= copy->from_ptr + 1;
441
 
  uint32_t to_char_length= (copy->to_length - 1) / cs->mbmaxlen;
442
 
  uint32_t length= cs->cset->well_formed_len(cs, (char*) from_ptr,
 
439
  uint from_length= (uint) *(uchar*) copy->from_ptr;
 
440
  const uchar *from_ptr= copy->from_ptr + 1;
 
441
  uint to_char_length= (copy->to_length - 1) / cs->mbmaxlen;
 
442
  uint length= cs->cset->well_formed_len(cs, (char*) from_ptr,
443
443
                                         (char*) from_ptr + from_length,
444
444
                                         to_char_length, &well_formed_error);
445
445
  if (length < from_length)
448
448
      copy->to_field->set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
449
449
                                  ER_WARN_DATA_TRUNCATED, 1);
450
450
  }
451
 
  *copy->to_ptr= (unsigned char) length;
 
451
  *copy->to_ptr= (uchar) length;
452
452
  memcpy(copy->to_ptr + 1, from_ptr, length);
453
453
}
454
454
 
455
455
 
456
456
static void do_varstring2(Copy_field *copy)
457
457
{
458
 
  uint32_t length=uint2korr(copy->from_ptr);
 
458
  uint length=uint2korr(copy->from_ptr);
459
459
  if (length > copy->to_length- HA_KEY_BLOB_LENGTH)
460
460
  {
461
461
    length=copy->to_length-HA_KEY_BLOB_LENGTH;
473
473
{
474
474
  int well_formed_error;
475
475
  const CHARSET_INFO * const cs= copy->from_field->charset();
476
 
  uint32_t char_length= (copy->to_length - HA_KEY_BLOB_LENGTH) / cs->mbmaxlen;
477
 
  uint32_t from_length= uint2korr(copy->from_ptr);
478
 
  const unsigned char *from_beg= copy->from_ptr + HA_KEY_BLOB_LENGTH;
479
 
  uint32_t length= cs->cset->well_formed_len(cs, (char*) from_beg,
 
476
  uint char_length= (copy->to_length - HA_KEY_BLOB_LENGTH) / cs->mbmaxlen;
 
477
  uint from_length= uint2korr(copy->from_ptr);
 
478
  const uchar *from_beg= copy->from_ptr + HA_KEY_BLOB_LENGTH;
 
479
  uint length= cs->cset->well_formed_len(cs, (char*) from_beg,
480
480
                                         (char*) from_beg + from_length,
481
481
                                         char_length, &well_formed_error);
482
482
  if (length < from_length)
502
502
  The 'to' buffer should have a size of field->pack_length()+1
503
503
*/
504
504
 
505
 
void Copy_field::set(unsigned char *to,Field *from)
 
505
void Copy_field::set(uchar *to,Field *from)
506
506
{
507
507
  from_ptr=from->ptr;
508
508
  to_ptr=to;
512
512
    from_null_ptr=from->null_ptr;
513
513
    from_bit=     from->null_bit;
514
514
    to_ptr[0]=    1;                            // Null as default value
515
 
    to_null_ptr=  (unsigned char*) to_ptr++;
 
515
    to_null_ptr=  (uchar*) to_ptr++;
516
516
    to_bit=       1;
517
517
    if (from->table->maybe_null)
518
518
    {