← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/mysql_protocol.cc

  • Committer: Brian Aker
  • Date: 2010-12-16 04:01:22 UTC
  • mfrom: (1996.2.1 compare)
  • Revision ID: brian@tangent.org-20101216040122-eodh5shwsij35ybe
Merge in uuid tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/mysql_protocol.cc
519
519
        pos[6]= 15;
520
520
        break;
521
521
 
 
522
      case DRIZZLE_TYPE_UUID:
 
523
        pos[6]= 15;
 
524
        break;
 
525
 
522
526
      case DRIZZLE_TYPE_DECIMAL:
523
527
        pos[6]= (char)246;
524
528
        break;
570
574
  char buff[MAX_FIELD_WIDTH];
571
575
  String str(buff,sizeof(buff), &my_charset_bin);
572
576
 
573
 
  from->val_str(&str);
 
577
  from->val_str_internal(&str);
574
578
 
575
579
  return netStoreData((const unsigned char *)str.ptr(), str.length());
576
580
}