← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/client_priv.h

  • Committer: Brian Aker
  • Date: 2009-03-30 18:13:06 UTC
  • mfrom: (968.1.1 lib-merge)
  • Revision ID: brian@tangent.org-20090330181306-hzodbge1b0v57puh
Merge of Eric's libdrizzle work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/client_priv.h
16
16
/* Common defines for all clients */
17
17
 
18
18
#include <drizzled/global.h>
 
19
#include <libdrizzle/drizzle_client.h>
19
20
#include <mysys/my_sys.h>
20
21
#include <mystrings/m_string.h>
21
 
#include <libdrizzleclient/libdrizzle.h>
22
 
#include <libdrizzleclient/errmsg.h>
23
 
#include <libdrizzleclient/password.h>
24
 
#include <libdrizzleclient/get_password.h>
25
22
#include <mysys/my_getopt.h>
26
23
 
 
24
#include "get_password.h"
 
25
 
27
26
#if TIME_WITH_SYS_TIME
28
27
# include <sys/time.h>
29
28
# include <time.h>
35
34
# endif
36
35
#endif
37
36
 
38
 
 
39
37
enum options_client
40
38
{
41
39
  OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
45
43
  OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
46
44
  OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH,
47
45
  OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT,
48
 
  OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH,
 
46
  OPT_MAX_INPUT_LINE,
49
47
  OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
50
48
  OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
51
49
  OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,