← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/drizzle.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:
libdrizzleclient/drizzle.c
18
18
 */
19
19
 
20
20
#include <drizzled/global.h>
21
 
#include <signal.h>
22
 
#include <errno.h>
23
 
 
24
21
#include <drizzled/common.h>
25
 
#include <libdrizzle/libdrizzle.h>
26
 
#include <libdrizzle/pack.h>
27
 
#include <libdrizzle/errmsg.h>
28
 
#include <libdrizzle/drizzle.h>
 
22
 
 
23
#include "libdrizzle_priv.h"
 
24
 
 
25
#include "libdrizzle.h"
 
26
#include "pack.h"
 
27
#include "errmsg.h"
 
28
#include "drizzle.h"
 
29
#include "net_serv.h"
 
30
#include "drizzle_data.h"
 
31
#include "local_infile.h"
 
32
 
29
33
#include <drizzled/gettext.h>
30
 
#include <libdrizzle/net_serv.h>
31
 
#include <libdrizzle/drizzle_data.h>
32
 
#include <libdrizzle/local_infile.h>
33
 
 
34
 
#include "libdrizzle_priv.h"
35
34
 
36
35
#include <stdio.h>
37
36
#include <stdlib.h>
41
40
#include <assert.h>
42
41
#include <pwd.h>
43
42
#include <sys/socket.h>
 
43
#include <signal.h>
 
44
#include <errno.h>
44
45
 
45
46
 
46
47
#define CONNECT_TIMEOUT 0