Commit 0a0f75b8 authored by venu@myvenu.com's avatar venu@myvenu.com

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

into myvenu.com:/home/venu/bk/src-4.1
parents 93d4055e d9d5ddb5
...@@ -2461,16 +2461,19 @@ AC_SUBST(GXX) ...@@ -2461,16 +2461,19 @@ AC_SUBST(GXX)
if test "$compile_readline" = "yes" if test "$compile_readline" = "yes"
then then
AC_OUTPUT(cmd-line-utils/Makefile)
AC_OUTPUT(cmd-line-utils/readline/Makefile) AC_OUTPUT(cmd-line-utils/readline/Makefile)
fi fi
if test "$compile_libedit" = "yes" if test "$compile_libedit" = "yes"
then then
AC_OUTPUT(cmd-line-utils/Makefile)
AC_OUTPUT(cmd-line-utils/libedit/Makefile) AC_OUTPUT(cmd-line-utils/libedit/Makefile)
fi 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 \ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
strings/Makefile regex/Makefile heap/Makefile \ strings/Makefile regex/Makefile heap/Makefile \
bdb/Makefile \ bdb/Makefile \
......
...@@ -42,7 +42,7 @@ bool Protocol::net_store_data(const char *from, uint length) ...@@ -42,7 +42,7 @@ bool Protocol::net_store_data(const char *from, uint length)
inline bool Protocol::convert_str(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 #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment