bk commit into 4.1 tree (msvensson:1.2204) BUG#2596

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2204 05/04/25 12:05:13 msvensson@neptunus.(none) +1 -0
  BUG#2596 MySQL Client Segmentation Fault on Solaris 9
    - Print readline or libedit version

  client/mysql.cc
    1.202 05/04/25 12:05:10 msvensson@neptunus.(none) +10 -2
    Print the version of readline or libedit library used.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug2596

--- 1.201/client/mysql.cc	2005-04-21 12:06:38 +02:00
+++ 1.202/client/mysql.cc	2005-04-25 12:05:10 +02:00
@@ -691,8 +691,16 @@
 #ifdef __NETWARE__
 #define printf	consoleprintf
 #endif
-  printf("%s  Ver %s Distrib %s, for %s (%s)\n",
-	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
+
+#if defined(USE_LIBEDIT_INTERFACE)
+  const char* readline= "";
+#else
+  const char* readline= "readline";
+#endif
+
+  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);
   if (version)
     return;
   printf("\