← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/client.c

  • Committer: mordred
  • Date: 2008-11-01 00:46:20 UTC
  • mto: (572.1.1 devel) (575.1.1 devel)
  • mto: This revision was merged to the branch mainline in revision 573.
  • Revision ID: mordred@opensolaris-20081101004620-vd0kzsl9k40hvf4p
Some updates to dtrace support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/client.c
42
42
#include <libdrizzle/libdrizzle.h>
43
43
#include <libdrizzle/net_serv.h>
44
44
#include "libdrizzle_priv.h"
 
45
#include <libdrizzle/pack.h>
45
46
 
46
47
#include <sys/poll.h>
47
48
#include <sys/ioctl.h>
76
77
#include <sys/un.h>
77
78
 
78
79
#include <errno.h>
79
 
#define SOCKET_ERROR -1
80
 
 
81
 
 
82
 
#include <drizzled/version.h>
83
 
#include <libdrizzle/sql_common.h>
84
 
#include <libdrizzle/gettext.h>
 
80
 
 
81
 
 
82
#include <drizzled/gettext.h>
85
83
#include "local_infile.h"
86
84
 
87
85
 
133
131
      len-=2;
134
132
      if (pos[0] == '#')
135
133
      {
136
 
        strncpy(net->sqlstate, pos+1, SQLSTATE_LENGTH);
137
 
        pos+= SQLSTATE_LENGTH+1;
 
134
        strncpy(net->sqlstate, pos+1, LIBDRIZZLE_SQLSTATE_LENGTH);
 
135
        pos+= LIBDRIZZLE_SQLSTATE_LENGTH+1;
138
136
      }
139
137
      else
140
138
      {