Index: server/databases/mysql.xml
===================================================================
--- server/databases/mysql.xml	(revision f231f7bce4180cf632b240a6277f72d286f7492e)
+++ server/databases/mysql.xml	(revision 47a345a29148614e64bf20b36a2077243d198238)
@@ -9,8 +9,8 @@
   <!ENTITY mysql-download-http "&sources-anduin-http;/m/mysql-&mysql-version;.tar.gz">
   <!ENTITY mysql-download-ftp  "&sources-anduin-ftp;/m/mysql-&mysql-version;.tar.gz">
-  <!ENTITY mysql-md5sum        "a90d87a71fa3c23dff6d78afc8e3184c">
-  <!ENTITY mysql-size          "23 MB">
-  <!ENTITY mysql-buildsize     "492 MB (additional 250 MB to run the test suite)">
-  <!ENTITY mysql-time          "4.7 SBU (Test suite is an additional 61 minutes, only partially CPU dependent)">
+  <!ENTITY mysql-md5sum        "43c11ad3dded693393c4815d24e2b0a5">
+  <!ENTITY mysql-size          "23.8 MB">
+  <!ENTITY mysql-buildsize     "500 MB (additional 200 MB to run the test suite)">
+  <!ENTITY mysql-time          "5.3 SBU (Test suite is an additional 55 minutes, only partially CPU dependent)">
 ]>
 
@@ -42,5 +42,5 @@
     in the download URLs have not been tested in a BLFS environment.</para>
 
-    <para>&lfssvn_checked;20100806&lfssvn_checked2;</para>
+    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -66,9 +66,14 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Download</bridgehead>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>Required Patch:
-          <ulink  url="&patch-root;/mysql-&mysql-version;-makefile-1.patch"/>
+          <ulink url="&patch-root;/mysql-&mysql-version;-makefile-1.patch"/>
+        </para>
+       </listitem>
+      <listitem>
+        <para>Optional Documentation (see tip below):
+          <ulink url="http://dev.mysql.com/doc/"/>
         </para>
        </listitem>
@@ -127,5 +132,5 @@
             --with-plugins=innobase,myisam \
             --with-extra-charsets=all \
-            --with-ssl &amp;&amp;
+            --with-ssl=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -142,6 +147,7 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make benchdir_root=/tmp/mysql-bench install &amp;&amp;
-rm -rf /tmp/mysql &amp;&amp;
+<screen role="root"><userinput>make benchdir_root=/tmp \
+          testroot=/tmp install &amp;&amp;
+rm -rf /tmp/mysql-test /tmp/sql-bench &amp;&amp;
 pushd /usr/lib &amp;&amp;
 ln -v -sf mysql/libmysqlclient{,_r}.so* . &amp;&amp;
@@ -206,16 +212,13 @@
     other table types.</para>
 
-    <para><parameter>--with-ssl</parameter>: This switch enables encrypted
-    communication between client and server.</para>
-
-    <para><command>make  benchdir_root=...</command>: This installs the benchmark
-    and test suites in a non-system location.</para>
+    <para><parameter>--with-ssl=/usr</parameter>: This switch enables encrypted
+    communication between client and server using OpenSSL.</para>
+
+    <para><command>make  benchdir_root=... install</command>: This installs the
+    benchmark and test suites in a non-system location.</para>
 
     <para><command>ln -v -sf mysql/libmysqlclient{,_r}.so* .</command>: This
     command makes the <application>MySQL</application> shared libraries
     available to other packages at run-time.</para>
-
-    <para><option>--with-openssl</option>: This switch adds OpenSSL support
-    to <application>MySQL</application>.</para>
 
     <para><option>--with-libwrap</option>: This switch adds tcpwrappers
@@ -255,9 +258,5 @@
       as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf
-sed -i -e 's/^skip-federated/#skip-federated/' /etc/my.cnf</userinput></screen>
-
-      <para>The change to <filename>/etc/my.cnf</filename> can be omitted if the
-      option <option>--with-plugins=federated</option> is used.</para>
+<screen role="root"><userinput>install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf</userinput></screen>
 
       <para>You can now install a database and change the ownership to the
@@ -343,5 +342,5 @@
     pages long. Instead, consult the <filename>mysql.info</filename>
     documentation or the on-line reference manual at <ulink
-    url="http://dev.mysql.com/doc/refman/5.0/en/index.html"/>.</para>
+    url="http://dev.mysql.com/doc/refman/5.1/en/index.html"/>.</para>
 
     <para>The <application>Perl</application> DBI modules must be installed
