Merge bk-internal.mysql.com:/data0/bk/mysql-4.1

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


BitKeeper/etc/logging_ok:
  auto-union

client/mysql.cc

@@ -698,9 +698,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("\