← 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: 2008-09-12 06:42:41 UTC
  • mto: (322.2.8 stdize-code)
  • mto: This revision was merged to the branch mainline in revision 386.
  • Revision ID: brian@tangent.org-20080912064241-520utxq2078904l2
Remove 3 byte UTF8 collation

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>
 
21
#include <libdrizzle/drizzle.h>
22
22
#include <libdrizzle/errmsg.h>
23
 
#include <libdrizzle/password.h>
24
 
#include <libdrizzle/get_password.h>
25
23
#include <mysys/my_getopt.h>
26
24
 
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
 
 
39
25
enum options_client
40
26
{
41
27
  OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
94
80
  OPT_AUTO_VERTICAL_OUTPUT,
95
81
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
96
82
  OPT_WRITE_BINLOG, OPT_DUMP_DATE,
97
 
  OPT_MAX_CLIENT_OPTION,
98
 
  OPT_SHOW_PROGRESS_SIZE
 
83
  OPT_MAX_CLIENT_OPTION
99
84
};