--- ./man/mysqldump.1	Wed May 14 16:24:37 2003
+++ ../mysql-4.0.13/./man/mysqldump.1	Fri Jun 13 12:01:03 2003
@@ -1,6 +1,6 @@
 .TH mysqldump 1 "19 December 2000" "MySQL 4.0" "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]"
@@ -64,7 +64,7 @@
 .TP 
 .BR  \-A | \-\-all\-databases 
 Dump all the databases. This will be same as
-.BR\-\-databases 
+.BR \-\-databases 
 with all databases selected.
 .TP                        
 .BR    \-a | \-\-all
--- ./man/mysqlaccess.1	Wed May 14 16:24:37 2003
+++ ../mysql-4.0.13/./man/mysqlaccess.1	Fri Jun 13 12:00:25 2003
@@ -1,7 +1,6 @@
 .TH mysqlaccess 1 "19 December 2000" "MySQL 4.0" "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
@@ -93,7 +92,7 @@
     + At least the user and the db must be given (even with wildcards)
     + If no host is given, `localhost' is assumed
     + Wilcards (*,?,%,_) are allowed for host, user and db, but be sure 
-      to escape them from your shell!! (ie type \* or '*')
+      to escape them from your shell!! (ie type \\* or '*')
 .SH "SEE ALSO"
 isamchk (1),
 isamlog (1),
--- ./vio/test-sslserver.c	Wed May 14 16:24:35 2003
+++ ../mysql-4.0.13/./vio/test-sslserver.c	Fri Jun 13 12:04:40 2003
@@ -91,7 +91,11 @@
 	struct sockaddr_in sa_cli;
 	int listen_sd;
 	int err;
+#if defined(__sgi) && _XOPEN_SOURCE >= 500
+	socklen_t client_len;
+#else
 	size_t client_len;
+#endif
 	int	reuseaddr = 1; /* better testing, uh? */
 
 	MY_INIT(argv[0]);
--- ./myisam/ft_dump.c	Wed May 14 16:24:37 2003
+++ ../mysql-4.0.13/./myisam/ft_dump.c	Fri Jun 13 12:04:02 2003
@@ -163,8 +163,20 @@
           doc_cnt=0;
         }
       }
-      if (dump)
+      if (dump) {
+#if defined(__sgi)
+        /* %q is available only on some platforms (BSD 4.4 and Linux), and
+         * is deprecated (see for example
+         *
+         * http://ccrma-www.stanford.edu/planetccrma/man/man3/printf.3.html)
+         *
+         * The more portable %ll is used here, instead.
+         */
+        printf("%9llx %20.7f %s\n",(ulonglong)info->lastpos,weight,buf);
+#else
         printf("%9qx %20.7f %s\n",info->lastpos,weight,buf);
+#endif
+      }
 
       if(verbose && (total%HOW_OFTEN_TO_WRITE)==0)
         printf("%10ld\r",total);
@@ -179,7 +191,13 @@
         if ((ulong) count >= total/2)
           break;
       }
-      printf("Total rows: %qu\nTotal words: %lu\n"
+      printf(
+#if defined(__sgi)
+	     /* Same as above: %q is not portable. */
+	     "Total rows: %llu\nTotal words: %lu\n"
+#else
+	     "Total rows: %qu\nTotal words: %lu\n"
+#endif
              "Unique words: %lu\nLongest word: %lu chars (%s)\n"
              "Median length: %u\n"
              "Average global weight: %f\n"
--- ./innobase/trx/trx0trx.c	Wed May 14 16:24:35 2003
+++ ../mysql-4.0.13/./innobase/trx/trx0trx.c	Fri Jun 13 11:59:42 2003
@@ -1505,6 +1505,8 @@
 
 		trx->op_info = (char *) "";
 	}
+
+	return(0);
 }
 
 /**************************************************************************
--- ./configure	Wed May 14 16:24:53 2003
+++ ../mysql-4.0.13/./configure	Fri Jun 13 11:58:22 2003
@@ -20883,7 +20883,7 @@
   if test "$openssl" = "yes"
   then
 
-  for d in /usr/ssl/include /usr/local/ssl/include /usr/include \
+  for d in ${ROOT}/usr/freeware/include /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
    if test -f $d/openssl/ssl.h  ; then
@@ -20891,9 +20891,9 @@
    fi
   done
 
- for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
+ for d in ${ROOT}/usr/freeware/${ABILIB-lib32} /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
 /usr/lib /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do
-  if test -f $d/libssl.a ; then
+  if test -f $d/libssl.a -o -f $d/libssl.so ; then
     OPENSSL_LIB=$d
   fi
  done
@@ -20937,7 +20937,7 @@
     case "$CLIENT_EXTRA_LDFLAGS $MYSQLD_EXTRA_LDFLAGS" in
 	*-all-static*) using_static="yes" ;;
     esac
-    if test $using_static = "yes"
+    if test "$using_static" = "yes"
     then
       echo "You can't use the --all-static link option when using openssl."
       exit 1