Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1

into kishkin.ru:/home/wax/mysql-4n

Build-tools/Do-compile

@@ -340,7 +340,7 @@ if (!$opt_no_test && !$opt_no_benchmark)
   $extra="";
   if ($opt_bdb)
   {
-    $extra.=" --bdb_cache_size=16M --bdb_max_lock=60000"
+    $extra.=" --bdb_cache_size=16M --bdb_max_lock=240000"
   }
   if ($opt_innodb)
   {

support-files/mysql.spec.sh

@@ -146,7 +146,7 @@ languages and applications need to dynamically load and use MySQL.
 
 %package Max
 Release: %{release}
-Summary: MySQL - server with Berkeley DB, RAID and UDF support
+Summary: MySQL - server with Berkeley DB, OpenSSL, RAID and UDF support
 Group: Applications/Databases
 Provides: mysql-Max
 Obsoletes: mysql-Max
@@ -154,7 +154,7 @@ Requires: MySQL >= 4.0
 
 %description Max 
 Optional MySQL server binary that supports additional features like
-Berkeley DB, RAID and User Defined Functions (UDF).
+Berkeley DB, OpenSSL, RAID and User Defined Functions (UDF).
 To activate this binary, just install this package in addition to
 the standard MySQL package.
 
@@ -255,6 +255,7 @@ export PATH
 # cannot be linked statically against the patched glibc)
 
 BuildMySQL "--enable-shared \
+		--with-openssl \
 		--with-berkeley-db \
 		--with-innodb \
 		--with-raid \