← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/client_priv.h

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/client_priv.h
15
15
 
16
16
/* Common defines for all clients */
17
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>
 
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>
 
23
#include <mysys/my_getopt.h>
24
24
 
25
25
enum options_client
26
26
{
36
36
  OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
37
37
  OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
38
38
  OPT_DELETE_MASTER_LOGS, OPT_COMPACT,
39
 
  OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL,
 
39
  OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_DRIZZLE_PROTOCOL,
40
40
  OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION,
41
41
  OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,
42
42
  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS, OPT_SERVER_ARG,
43
43
  OPT_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
44
44
  OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,
45
45
  OPT_TRIGGERS,
46
 
  OPT_MYSQL_ONLY_PRINT,
47
 
  OPT_MYSQL_LOCK_DIRECTORY,
 
46
  OPT_DRIZZLE_ONLY_PRINT,
 
47
  OPT_DRIZZLE_LOCK_DIRECTORY,
48
48
  OPT_USE_THREADS,
49
49
  OPT_IMPORT_USE_THREADS,
50
 
  OPT_MYSQL_NUMBER_OF_QUERY,
 
50
  OPT_DRIZZLE_NUMBER_OF_QUERY,
51
51
  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
52
52
  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,
53
 
  OPT_MYSQLDUMP_SLAVE_APPLY,
54
 
  OPT_MYSQLDUMP_SLAVE_DATA,
55
 
  OPT_MYSQLDUMP_INCLUDE_MASTER_HOST_PORT,
 
53
  OPT_DRIZZLEDUMP_SLAVE_APPLY,
 
54
  OPT_DRIZZLEDUMP_SLAVE_DATA,
 
55
  OPT_DRIZZLEDUMP_INCLUDE_MASTER_HOST_PORT,
56
56
  OPT_SLAP_CSV, OPT_SLAP_CREATE_STRING,
57
57
  OPT_SLAP_AUTO_GENERATE_SQL_LOAD_TYPE, OPT_SLAP_AUTO_GENERATE_WRITE_NUM,
58
58
  OPT_SLAP_AUTO_GENERATE_ADD_AUTO,
68
68
  OPT_SLAP_IGNORE_SQL_ERRORS,
69
69
  OPT_SLAP_COMMIT,
70
70
  OPT_SLAP_DETACH,
71
 
  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT_MODE, OPT_SERVER_ID,
 
71
  OPT_DRIZZLE_REPLACE_INTO, OPT_BASE64_OUTPUT_MODE, OPT_SERVER_ID,
72
72
  OPT_SLAP_BURNIN,
73
73
  OPT_SLAP_TIMER_LENGTH,
74
74
  OPT_SLAP_DELAYED_START,