bk commit into 5.0 tree (geert:1.1827)

[Geert Vanderkelen]

Below is the list of changes that have just been committed into a local
5.0 repository of geert. When geert 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.1827 05/04/29 14:46:53 geert@stripped +1 -0
  Merge gvanderkelen@stripped:/home/bk/mysql-5.0
  into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0

  client/mysql.cc
    1.167 05/04/29 14:46:51 geert@stripped +0 -0
    Auto merged

# 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:	geert
# Host:	kriem.kemuri.org
# Root:	/home/geert/MySQL/mysql-5.0/RESYNC

--- 1.166/client/mysql.cc	2005-04-27 14:17:48 +02:00
+++ 1.167/client/mysql.cc	2005-04-29 14:46:51 +02:00
@@ -713,8 +713,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("\
@@ -1333,7 +1341,7 @@
   setlocale(LC_ALL,""); /* so as libedit use isprint */
 #endif
   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-  rl_completion_entry_function= (CPFunction*)&no_completion;
+  rl_completion_entry_function= (Function*)&no_completion;
 #else
   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
   rl_completion_entry_function= (Function*)&no_completion;