bk commit into 4.1 tree (rburnett:1.2227) BUG#10245

[reggie]

Below is the list of changes that have just been committed into a local
4.1 repository of rburnett. When rburnett 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.2227 05/05/05 17:48:50 rburnett@stripped +2 -0
  Bug #10245 VC++ compiler error with mysql.cc 
  
  Only print the read line version if we are on a platform that supports readline
  
  mysql.cc:
    Add #ifdef to only print readline version if we are on a platform that supports
readline

  BitKeeper/etc/logging_ok
    1.381 05/05/05 17:48:49 rburnett@stripped +1 -0
    Logging to logging@stripped accepted

  client/mysql.cc
    1.203 05/05/05 17:47:53 rburnett@stripped +6 -0
    Add #ifdef to only print readline version if we are on a platform that supports
readline

# 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:	rburnett
# Host:	bk-internal.mysql.com
# Root:	/users/rburnett/bug10245

--- 1.202/client/mysql.cc	2005-04-25 12:05:10 +02:00
+++ 1.203/client/mysql.cc	2005-05-05 17:47:53 +02:00
@@ -698,9 +698,15 @@
   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("\

--- 1.380/BitKeeper/etc/logging_ok	2005-05-04 10:16:02 +02:00
+++ 1.381/BitKeeper/etc/logging_ok	2005-05-05 17:48:49 +02:00
@@ -195,6 +195,7 @@
 ram@ram.(none)
 ramil@stripped
 ranger@stripped
+rburnett@stripped
 rburnett@stripped
 reggie@bob.(none)
 reggie@mdk10.(none)