~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/libdrizzle.c

  • Committer: Jay Pipes
  • Date: 2009-02-04 15:44:25 UTC
  • mfrom: (829 drizzle)
  • mto: This revision was merged to the branch mainline in revision 830.
  • Revision ID: jpipes@serialcoder-20090204154425-th8xfk2ujz2y8xwg
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
#include <drizzled/global.h>
21
21
#include "libdrizzle_priv.h"
22
22
 
23
 
#include <libdrizzle/libdrizzle.h>
24
 
#include <libdrizzle/pack.h>
25
 
#include <libdrizzle/errmsg.h>
 
23
#include "libdrizzle.h"
 
24
#include "errmsg.h"
 
25
#include "pack.h"
 
26
 
26
27
#include <sys/stat.h>
27
28
#include <signal.h>
28
29
#include <time.h>
547
548
    char escape= 0;
548
549
    if (!U8_IS_SINGLE(*from))
549
550
    {
550
 
      tmp_length= U8_LENGTH(*from);
 
551
      tmp_length= U8_LENGTH(*(uint32_t*)from);
551
552
      if (to + tmp_length > to_end)
552
553
      {
553
554
        overflow= true;