Commit d8dd1cea authored by unknown's avatar unknown

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

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

parents 69b8b99a 59e8c553
...@@ -340,7 +340,7 @@ if (!$opt_no_test && !$opt_no_benchmark) ...@@ -340,7 +340,7 @@ if (!$opt_no_test && !$opt_no_benchmark)
$extra=""; $extra="";
if ($opt_bdb) if ($opt_bdb)
{ {
$extra.=" --bdb_cache_size=16M --bdb_max_lock=60000" $extra.=" --bdb_cache_size=16M --bdb_max_lock=240000"
} }
if ($opt_innodb) if ($opt_innodb)
{ {
......
...@@ -146,7 +146,7 @@ languages and applications need to dynamically load and use MySQL. ...@@ -146,7 +146,7 @@ languages and applications need to dynamically load and use MySQL.
%package Max %package Max
Release: %{release} 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 Group: Applications/Databases
Provides: mysql-Max Provides: mysql-Max
Obsoletes: mysql-Max Obsoletes: mysql-Max
...@@ -154,7 +154,7 @@ Requires: MySQL >= 4.0 ...@@ -154,7 +154,7 @@ Requires: MySQL >= 4.0
%description Max %description Max
Optional MySQL server binary that supports additional features like 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 To activate this binary, just install this package in addition to
the standard MySQL package. the standard MySQL package.
...@@ -255,6 +255,7 @@ export PATH ...@@ -255,6 +255,7 @@ export PATH
# cannot be linked statically against the patched glibc) # cannot be linked statically against the patched glibc)
BuildMySQL "--enable-shared \ BuildMySQL "--enable-shared \
--with-openssl \
--with-berkeley-db \ --with-berkeley-db \
--with-innodb \ --with-innodb \
--with-raid \ --with-raid \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment