← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Brian Aker
  • Date: 2009-04-05 19:53:29 UTC
  • mfrom: (971.3.11 eday-dev)
  • Revision ID: brian@tangent.org-20090405195329-k2vpiwhlri9oaedq
Merge from Eric.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
30
30
#include <drizzled/function/str/conv_charset.h>
31
31
#include <drizzled/virtual_column_info.h>
32
32
#include <drizzled/sql_base.h>
 
33
#include <drizzled/util/convert.h>
33
34
 
34
35
 
35
36
#include <drizzled/field/str.h>
1343
1344
    enum DRIZZLE_ERROR::enum_warning_level level;
1344
1345
    uint32_t diff= str->length() - wlen;
1345
1346
    set_if_smaller(diff, 3U);
1346
 
    drizzleclient_drizzleclient_octet2hex(hexbuf, str->ptr() + wlen, diff);
 
1347
    (void) drizzled_string_to_hex(hexbuf, str->ptr() + wlen, diff);
1347
1348
    if (send_error)
1348
1349
    {
1349
1350
      my_error(ER_INVALID_CHARACTER_STRING, MYF(0),