← 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-07-11 19:23:04 UTC
  • mfrom: (1089.1.14 merge)
  • Revision ID: brian@gaz-20090711192304-ootijyl5yf9jq9kd
Merge Brian

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 <mysys/my_sys.h>
20
 
#include <mystrings/m_string.h>
21
 
#include <libdrizzle/drizzle.h>
22
 
#include <libdrizzle/errmsg.h>
 
19
#include <libdrizzle/drizzle_client.h>
23
20
#include <mysys/my_getopt.h>
24
21
 
 
22
#include "client/get_password.h"
 
23
 
 
24
#if TIME_WITH_SYS_TIME
 
25
# include <sys/time.h>
 
26
# include <time.h>
 
27
#else
 
28
# if HAVE_SYS_TIME_H
 
29
#  include <sys/time.h>
 
30
# else
 
31
#  include <time.h>
 
32
# endif
 
33
#endif
 
34
 
25
35
enum options_client
26
36
{
27
37
  OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
31
41
  OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
32
42
  OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH,
33
43
  OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT,
34
 
  OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH,
 
44
  OPT_MAX_INPUT_LINE, OPT_SHUTDOWN, OPT_PING,
35
45
  OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
36
46
  OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
37
47
  OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
78
88
  OPT_SLAP_AUTO_GENERATE_SELECT_COLUMNS,
79
89
  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
80
90
  OPT_AUTO_VERTICAL_OUTPUT,
81
 
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
 
91
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES,
82
92
  OPT_WRITE_BINLOG, OPT_DUMP_DATE,
83
 
  OPT_MAX_CLIENT_OPTION
 
93
  OPT_MAX_CLIENT_OPTION,
 
94
  OPT_SHOW_PROGRESS_SIZE
84
95
};