← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.c

  • Committer: Brian Aker
  • Date: 2008-08-07 16:29:49 UTC
  • mfrom: (264.1.20 codestyle)
  • Revision ID: brian@tangent.org-20080807162949-7o8eyjgdn8ms3n1a
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleimport.c
54
54
static uint     opt_drizzle_port= 0, opt_protocol= 0;
55
55
static char * opt_drizzle_unix_port=0;
56
56
static int64_t opt_ignore_lines= -1;
57
 
static CHARSET_INFO *charset_info= &my_charset_latin1;
 
57
static const CHARSET_INFO *charset_info= &my_charset_latin1;
58
58
 
59
59
static struct my_option my_long_options[] =
60
60
{
121
121
   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
122
122
  {"port", 'P', "Port number to use for connection or 0 for default to, in "
123
123
   "order of preference, my.cnf, $MYSQL_TCP_PORT, "
124
 
#if MYSQL_PORT_DEFAULT == 0
125
 
   "/etc/services, "
126
 
#endif
127
124
   "built-in default (" STRINGIFY_ARG(MYSQL_PORT) ").",
128
125
   (char**) &opt_drizzle_port,
129
126
   (char**) &opt_drizzle_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
159
156
static void print_version(void)
160
157
{
161
158
  printf("%s  Ver %s Distrib %s, for %s (%s)\n" ,my_progname,
162
 
    IMPORT_VERSION, MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
 
159
    IMPORT_VERSION, drizzle_get_client_info(),SYSTEM_TYPE,MACHINE_TYPE);
163
160
}
164
161
 
165
162