← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/local_infile.c

  • Committer: Monty Taylor
  • Date: 2008-07-31 21:19:50 UTC
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: monty@inaugust.com-20080731211950-jplp4odx34ge6fat
Couple of small post-merge fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/local_infile.c
21
21
#include <drizzled/global.h>
22
22
#include <mysys/my_sys.h>
23
23
#include "my_time.h"
24
 
#include <mysys_err.h>
 
24
#include <mysys/mysys_err.h>
25
25
#include <mystrings/m_string.h>
26
26
#include <mystrings/m_ctype.h>
27
27
#include "drizzle.h"
28
 
#include "drizzled_error.h"
29
28
#include "errmsg.h"
30
 
#include <violite.h>
 
29
#include <vio/violite.h>
31
30
#include <sys/stat.h>
32
31
#include <signal.h>
33
32
#include <time.h>
52
51
#ifdef HAVE_SYS_UN_H
53
52
#include <sys/un.h>
54
53
#endif
55
 
#include <my_pthread.h>        /* because of signal()  */
56
54
#ifndef INADDR_NONE
57
55
#define INADDR_NONE  -1
58
56
#endif