← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/client_priv.h

  • Committer: Monty Taylor
  • Date: 2008-10-16 06:32:59 UTC
  • mfrom: (518 drizzle)
  • mto: (511.1.5 codestyle)
  • mto: This revision was merged to the branch mainline in revision 521.
  • Revision ID: monty@inaugust.com-20081016063259-fwbqogq7lnezct0l
Merged with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/client_priv.h
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
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/internal/my_sys.h>
23
 
 
24
 
#include <client/get_password.h>
 
17
 
 
18
#include <drizzled/global.h>
 
19
#include <mysys/my_sys.h>
 
20
#include <mystrings/m_string.h>
 
21
#include <libdrizzle/libdrizzle.h>
 
22
#include <libdrizzle/errmsg.h>
 
23
#include <mysys/my_getopt.h>
25
24
 
26
25
#if TIME_WITH_SYS_TIME
27
26
# include <sys/time.h>
32
31
# else
33
32
#  include <time.h>
34
33
# endif
35
 
#endif
 
34
#endif  
 
35
 
36
36
 
37
37
enum options_client
38
38
{
43
43
  OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
44
44
  OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH,
45
45
  OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT,
46
 
  OPT_MAX_INPUT_LINE, OPT_SHUTDOWN, OPT_PING,
 
46
  OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH,
47
47
  OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
48
48
  OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
49
49
  OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
90
90
  OPT_SLAP_AUTO_GENERATE_SELECT_COLUMNS,
91
91
  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
92
92
  OPT_AUTO_VERTICAL_OUTPUT,
93
 
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES,
 
93
  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
94
94
  OPT_WRITE_BINLOG, OPT_DUMP_DATE,
95
 
  OPT_MAX_CLIENT_OPTION,
96
 
  OPT_SHOW_PROGRESS_SIZE
 
95
  OPT_MAX_CLIENT_OPTION
97
96
};
98
 
 
99
 
#endif /* CLIENT_CLIENT_PRIV_H */