Backport r1308718 to 2.2 and rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1308722 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index e445e536247fbfa46064e15fda59371e51c3dea2..e68eb6d6841a5700cbfc9009f338854a66c4b27b 100644 (file)
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -130,6 +130,13 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
     <p>It is up to dbd user modules to use the prepared statements
     and document what statements can be specified in httpd.conf,
     or to provide their own directives and use <code>ap_dbd_prepare</code>.</p>
+       <div class="warning"><h3>Caveat</h3>
+       When using prepared statements with a MySQL database, it is preferred to set
+       <code>reconnect</code> to 0 in the connection string as to avoid errors that
+       arise from the MySQL client reconnecting without properly resetting the
+       prepared statements. If set to 1, any broken connections will be attempted
+       fixed, but as mod_dbd is not informed, the prepared statements will be invalidated.
+       </div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="security" id="security">SECURITY WARNING</a></h2>

diff --git a/docs/manual/mod/mod_dbd.xml b/docs/manual/mod/mod_dbd.xml
index 45d91b72405f1c25b013c209e4813b5e0df2de3e..522dcf35ea73ef673ece5a155043d12e4c8c7df9 100644 (file)
--- a/docs/manual/mod/mod_dbd.xml
+++ b/docs/manual/mod/mod_dbd.xml
@@ -112,6 +112,13 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
     <p>It is up to dbd user modules to use the prepared statements
     and document what statements can be specified in httpd.conf,
     or to provide their own directives and use <code>ap_dbd_prepare</code>.</p>
+       <note type="warning"><title>Caveat</title>
+       When using prepared statements with a MySQL database, it is preferred to set
+       <code>reconnect</code> to 0 in the connection string as to avoid errors that
+       arise from the MySQL client reconnecting without properly resetting the
+       prepared statements. If set to 1, any broken connections will be attempted
+       fixed, but as mod_dbd is not informed, the prepared statements will be invalidated.
+       </note>
 </section>
 
 <section id="security">