Merge marko@build.mysql.com:/home/bk/mysql-4.0

into hundin.mysql.fi:/home/marko/k/mysql-4.0

Build-tools/my_md5sum

@@ -13,7 +13,7 @@ use strict;
 use Digest::MD5;
 use Getopt::Long;
 
-my $VER= "1.0";
+my $VER= "1.1";
 
 #
 # Strip the leading path info off the program name ($0). We want 'my_md5sum'
@@ -64,8 +64,9 @@ if ($opt_check)
 		my $digest= &mkmd5($checkfile);
 
 		# Check the fresh MD5 against what is recorded in the file
-		# Print an error message if they don't match
-		print "$0: MD5 check failed for '$checkfile'\n" if $digest ne $checksum;
+		# Print an error message if they don't match, else print OK
+		print "$checkfile: FAILED\n" if $digest ne $checksum;
+		print "$checkfile: OK\n" if $digest eq $checksum;
 	}
 }
 # Else generate the MD5 digest to STDOUT

acinclude.m4

@@ -737,14 +737,15 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
     ---)
       for d in /usr/ssl/include /usr/local/ssl/include /usr/include \
 /usr/include/ssl /opt/ssl/include /opt/openssl/include \
-/usr/local/ssl/include /usr/local/include ; do
+/usr/local/ssl/include /usr/local/include /usr/freeware/include ; do
        if test -f $d/openssl/ssl.h  ; then
          OPENSSL_INCLUDE=-I$d
        fi
       done
 
       for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
-/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do
+/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \
+/usr/freeware/lib32 /usr/local/lib/ ; do
       if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then
         OPENSSL_LIB=$d
       fi

man/mysqlaccess.1.in

 .TH mysqlaccess 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
 .SH NAME
-.BR mysqlaccess
- \- Create new users to mysql.
+.BR mysqlaccess \- Create new users to mysql.
 .SH USAGE
 mysqlaccess [host [user [db]]] OPTIONS
 .SH SYNOPSIS

man/mysqldump.1.in

 .TH mysqldump 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
 .SH NAME
-mysqldump \- text-based client for dumping or backing up mysql databases , tables and or data.
+mysqldump \- text\-based client for dumping or backing up mysql databases, tables and or data.
 
 .SH  USAGE
 .BR "mysqldump [\fP\fIOPTIONS\fP] database [\fP\fItables\fP]"

mysys/hash.c

@@ -182,7 +182,8 @@ uint calc_hashnr_caseup(const byte *key, uint len)
 #endif
 
 
-#ifndef __SUNPRO_C				/* SUNPRO can't handle this */
+/* for compilers which can not handle inline */
+#if !defined(__SUNPRO_C) && !defined(__USLC__) && !defined(__sgi)
 inline
 #endif
 unsigned int rec_hashnr(HASH *hash,const byte *record)

vio/test-sslserver.c

@@ -91,7 +91,12 @@ main(int argc __attribute__((unused)), char** argv)
 	struct sockaddr_in sa_cli;
 	int listen_sd;
 	int err;
+
+#if defined(__sgi) && _NO_XOPEN4 && _NO_XOPEN5
+	socklen_t client_len;
+#else
 	size_t client_len;
+#endif
 	int	reuseaddr = 1; /* better testing, uh? */
 
 	MY_INIT(argv[0]);