← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Monty Taylor
  • Date: 2008-08-06 02:14:03 UTC
  • mto: (266.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 266.
  • Revision ID: monty@inaugust.com-20080806021403-f7eegu1nbvx10x66
Removed client insistence on version.h stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
4572
4572
   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
4573
4573
  {"port", 'P', "Port number to use for connection or 0 for default to, in "
4574
4574
   "order of preference, my.cnf, $MYSQL_TCP_PORT, "
4575
 
#if MYSQL_PORT_DEFAULT == 0
4576
 
   "/etc/services, "
4577
 
#endif
4578
4575
   "built-in default (" STRINGIFY_ARG(MYSQL_PORT) ").",
4579
4576
   (char**) &opt_port,
4580
4577
   (char**) &opt_port, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
4617
4614
static void print_version(void)
4618
4615
{
4619
4616
  printf("%s  Ver %s Distrib %s, for %s (%s)\n",my_progname,MTEST_VERSION,
4620
 
   MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
 
4617
   drizzle_get_client_info(),SYSTEM_TYPE,MACHINE_TYPE);
4621
4618
}
4622
4619
 
4623
4620
static void usage(void)
5611
5608
                1024, 0, 0, get_var_key, var_free, MYF(0)))
5612
5609
    die("Variable hash initialization failed");
5613
5610
 
5614
 
  var_set_string("$MYSQL_SERVER_VERSION", MYSQL_SERVER_VERSION);
 
5611
  var_set_string("$MYSQL_SERVER_VERSION", drizzle_get_client_info());
5615
5612
 
5616
5613
  memset(&master_pos, 0, sizeof(master_pos));
5617
5614