Merge work.mysql.com:/home/bk/mysql-4.1

into myvenu.com:/home/venu/bk/src-4.1

configure.in

@@ -2461,16 +2461,19 @@ AC_SUBST(GXX)
 
 if test "$compile_readline" = "yes"
 then
-    AC_OUTPUT(cmd-line-utils/Makefile)
     AC_OUTPUT(cmd-line-utils/readline/Makefile)
 fi
 
 if test "$compile_libedit" = "yes"
 then
-    AC_OUTPUT(cmd-line-utils/Makefile)
     AC_OUTPUT(cmd-line-utils/libedit/Makefile)
 fi
 
+if [test "$compile_libedit" = "yes"] || [test "$compile_readline" = "yes"]
+then
+    AC_OUTPUT(cmd-line-utils/Makefile)
+fi 
+
 AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
  strings/Makefile regex/Makefile heap/Makefile \
  bdb/Makefile \

sql/protocol.cc

@@ -42,7 +42,7 @@ bool Protocol::net_store_data(const char *from, uint length)
 
 inline bool Protocol::convert_str(const char *from, uint length)
 {
-  convert->store(packet, from, length);
+  return convert->store(packet, from, length);
 }
 #endif