← 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-02-12 22:45:08 UTC
  • Revision ID: brian@tangent.org-20090212224508-mrd9jwgn1zjdpqdk
Minor refactoring (we will need to disconnect the code from the include
file).

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/client_priv.h
18
18
#include <drizzled/global.h>
19
19
#include <mysys/my_sys.h>
20
20
#include <mystrings/m_string.h>
21
 
#include <libdrizzle/libdrizzle.h>
22
 
#include <libdrizzle/errmsg.h>
 
21
#include <libdrizzleclient/libdrizzle.h>
 
22
#include <libdrizzleclient/errmsg.h>
 
23
#include <libdrizzleclient/password.h>
 
24
#include <libdrizzleclient/get_password.h>
23
25
#include <mysys/my_getopt.h>
24
26
 
 
27
#if TIME_WITH_SYS_TIME
 
28
# include <sys/time.h>
 
29
# include <time.h>
 
30
#else
 
31
# if HAVE_SYS_TIME_H
 
32
#  include <sys/time.h>
 
33
# else
 
34
#  include <time.h>
 
35
# endif
 
36
#endif
 
37
 
 
38
 
25
39
enum options_client
26
40
{
27
41
  OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
78
92
  OPT_SLAP_AUTO_GENERATE_SELECT_COLUMNS,
79
93
  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
80
94
  OPT_AUTO_VERTICAL_OUTPUT,
81
 
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
 
95
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES,
82
96
  OPT_WRITE_BINLOG, OPT_DUMP_DATE,
83
 
  OPT_MAX_CLIENT_OPTION
 
97
  OPT_MAX_CLIENT_OPTION,
 
98
  OPT_SHOW_PROGRESS_SIZE
84
99
};