← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

Moved more drizzleclient/NET specific code to Protocol class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
49
49
#include <drizzled/field/datetime.h>
50
50
#include <drizzled/field/varstring.h>
51
51
 
 
52
#include <libdrizzle/drizzle_client.h>
 
53
 
52
54
#include <math.h>
53
55
 
54
56
const String my_null_string("NULL", 4, default_charset_info);
1343
1345
    enum DRIZZLE_ERROR::enum_warning_level level;
1344
1346
    uint32_t diff= str->length() - wlen;
1345
1347
    set_if_smaller(diff, 3U);
1346
 
    drizzleclient_drizzleclient_octet2hex(hexbuf, str->ptr() + wlen, diff);
 
1348
    (void) drizzle_hex_string(hexbuf, str->ptr() + wlen, diff);
1347
1349
    if (send_error)
1348
1350
    {
1349
1351
      my_error(ER_INVALID_CHARACTER_STRING, MYF(0),