Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.0-build

Docs/manual.texi:
  Auto merged

Docs/manual.ja.texi

@@ -23949,7 +23949,7 @@ Uptime: 10077  Threads: 1  Questions: 9  Slow queries: 0  Opens: 6  Flush tables
 @item Max memory used @tab mysqld のコードによって直接割り当てられる最大メモリー量 (only available when @strong{MySQL} is compiled with --with-debug)
 @end multitable
 
-If you do @code{myslqadmin shutdown} on a socket (in other words, on a
+If you do @code{mysqladmin shutdown} on a socket (in other words, on a
 the computer where @code{mysqld} is running), @code{mysqladmin} will
 wait until the @code{MySQL} @code{pid-file} is removed to ensure that
 the @code{mysqld server} has stopped properly.

Docs/manual.texi

@@ -22470,7 +22470,7 @@ The @code{mysqladmin status} command result has the following columns:
 @item Max memory used @tab Maximum memory allocated directly by the @code{mysqld} code (only available when MySQL is compiled with --with-debug=full).
 @end multitable
 
-If you do @code{myslqadmin shutdown} on a socket (in other words, on a
+If you do @code{mysqladmin shutdown} on a socket (in other words, on a
 the computer where @code{mysqld} is running), @code{mysqladmin} will
 wait until the MySQL @code{pid-file} is removed to ensure that
 the @code{mysqld} server has stopped properly.

support-files/mysql.spec.sh

@@ -221,7 +221,7 @@ BuildMySQL "--disable-shared \
 			$USE_OTHER_LIBC_DIR \
 			--with-berkeley-db \
 			--with-innodb \
-			--with-ssl \
+			--with-openssl \
 			--with-vio \
 			--with-server-suffix='-Max'"
 
@@ -256,7 +256,7 @@ BuildMySQL "--disable-shared \
   	 $USE_OTHER_LIBC_DIR \
 	   --without-berkeley-db \
 		 --without-vio \
-		 --without-ssl"
+		 --without-openssl"
 nm --numeric-sort sql/mysqld > sql/mysqld.sym
 
 %install -n mysql-%{mysql_version}