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

into mysql.com:/space/my/mysql-4.1

BUILD/compile-pentium-debug-openssl

@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs  --with-debug=full --with-vio --with-openssl --without-innodb"
+extra_configs="$extra_configs  --with-debug=full --with-openssl"
 
 . "$path/FINISH.sh"

libmysqld/lib_vio.c

@@ -31,7 +31,6 @@
 #include <errno.h>
 #include <my_sys.h>
 #include <violite.h>
-#include <my_sys.h>
 #include <my_net.h>
 #include <m_string.h>
 #include <dbug.h>