~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/client_priv.h

  • Committer: Lee
  • Date: 2009-01-07 22:45:50 UTC
  • mfrom: (772 drizzle)
  • mto: This revision was merged to the branch mainline in revision 777.
  • Revision ID: lbieber@lbieber-desktop-20090107224550-tzjtc8klmv84ppyg
finish enabling tests, remove timezone2, timezone3

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 <libdrizzle/password.h>
 
24
#include <libdrizzle/get_password.h>
 
25
#include <mysys/my_getopt.h>
25
26
 
26
27
#if TIME_WITH_SYS_TIME
27
28
# include <sys/time.h>
34
35
# endif
35
36
#endif
36
37
 
 
38
 
37
39
enum options_client
38
40
{
39
41
  OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
43
45
  OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
44
46
  OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH,
45
47
  OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT,
46
 
  OPT_MAX_INPUT_LINE, OPT_SHUTDOWN, OPT_PING,
 
48
  OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH,
47
49
  OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
48
50
  OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
49
51
  OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
95
97
  OPT_MAX_CLIENT_OPTION,
96
98
  OPT_SHOW_PROGRESS_SIZE
97
99
};
98
 
 
99
 
#endif /* CLIENT_CLIENT_PRIV_H */