Commit 0430cdb7 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/users/rburnett/bug10245 

into bk-internal.mysql.com:/users/rburnett/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
parents 45767760 09ca059e

client/mysql.cc

+6 −0
Original line number Diff line number Diff line
@@ -710,9 +710,15 @@ static void usage(int version) 
  const char* readline= "readline";

#endif



#ifdef HAVE_READLINE

  printf("%s  Ver %s Distrib %s, for %s (%s) using %s %s\n",

	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,

         readline, rl_library_version);

#else

  printf("%s  Ver %s Distrib %s, for %s (%s)", my_progname, VER,

	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);

#endif



  if (version)

    return;

  printf("\