← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/client_priv.h

  • Committer: Stewart Smith
  • Date: 2008-07-13 06:56:15 UTC
  • mto: (210.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 211.
  • Revision ID: stewart@flamingspork.com-20080713065615-vzok75kgnnviokl9
Move MD5() into a UDF

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/client_priv.h
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
/* Common defines for all clients */
17
 
#ifndef CLIENT_CLIENT_PRIV_H
18
 
#define CLIENT_CLIENT_PRIV_H
19
 
 
20
 
#include "config.h"
21
 
#include <libdrizzle/drizzle_client.h>
22
 
#include "drizzled/option.h"
23
 
#include "drizzled/internal/my_sys.h"
24
 
 
25
 
#include "client/get_password.h"
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
 
17
 
 
18
#include <my_global.h>
 
19
#include <my_sys.h>
 
20
#include <m_string.h>
 
21
#include <drizzle.h>
 
22
#include <errmsg.h>
 
23
#include <my_getopt.h>
37
24
 
38
25
enum options_client
39
26
{
44
31
  OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
45
32
  OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH,
46
33
  OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT,
47
 
  OPT_MAX_INPUT_LINE, OPT_SHUTDOWN, OPT_PING,
 
34
  OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH,
48
35
  OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
49
36
  OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
50
37
  OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
51
38
  OPT_DELETE_MASTER_LOGS, OPT_COMPACT,
52
 
  OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_DRIZZLE_PROTOCOL,
 
39
  OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL,
53
40
  OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION,
54
41
  OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,
55
42
  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS, OPT_SERVER_ARG,
56
43
  OPT_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
57
44
  OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,
58
45
  OPT_TRIGGERS,
59
 
  OPT_DRIZZLE_ONLY_PRINT,
60
 
  OPT_DRIZZLE_LOCK_DIRECTORY,
 
46
  OPT_MYSQL_ONLY_PRINT,
 
47
  OPT_MYSQL_LOCK_DIRECTORY,
61
48
  OPT_USE_THREADS,
62
49
  OPT_IMPORT_USE_THREADS,
63
 
  OPT_DRIZZLE_NUMBER_OF_QUERY,
 
50
  OPT_MYSQL_NUMBER_OF_QUERY,
64
51
  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
65
52
  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,
66
 
  OPT_DRIZZLEDUMP_SLAVE_APPLY,
67
 
  OPT_DRIZZLEDUMP_SLAVE_DATA,
68
 
  OPT_DRIZZLEDUMP_INCLUDE_MASTER_HOST_PORT,
 
53
  OPT_MYSQLDUMP_SLAVE_APPLY,
 
54
  OPT_MYSQLDUMP_SLAVE_DATA,
 
55
  OPT_MYSQLDUMP_INCLUDE_MASTER_HOST_PORT,
69
56
  OPT_SLAP_CSV, OPT_SLAP_CREATE_STRING,
70
57
  OPT_SLAP_AUTO_GENERATE_SQL_LOAD_TYPE, OPT_SLAP_AUTO_GENERATE_WRITE_NUM,
71
58
  OPT_SLAP_AUTO_GENERATE_ADD_AUTO,
81
68
  OPT_SLAP_IGNORE_SQL_ERRORS,
82
69
  OPT_SLAP_COMMIT,
83
70
  OPT_SLAP_DETACH,
84
 
  OPT_DRIZZLE_REPLACE_INTO, OPT_BASE64_OUTPUT_MODE, OPT_SERVER_ID,
 
71
  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT_MODE, OPT_SERVER_ID,
85
72
  OPT_SLAP_BURNIN,
86
73
  OPT_SLAP_TIMER_LENGTH,
87
74
  OPT_SLAP_DELAYED_START,
91
78
  OPT_SLAP_AUTO_GENERATE_SELECT_COLUMNS,
92
79
  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
93
80
  OPT_AUTO_VERTICAL_OUTPUT,
94
 
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES,
 
81
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
95
82
  OPT_WRITE_BINLOG, OPT_DUMP_DATE,
96
 
  OPT_MAX_CLIENT_OPTION,
97
 
  OPT_SHOW_PROGRESS_SIZE
 
83
  OPT_MAX_CLIENT_OPTION
98
84
};
99
 
 
100
 
#endif /* CLIENT_CLIENT_PRIV_H */