From: Daniel Gruno <humbedooh@apache.org>
Date: Tue, 3 Apr 2012 06:49:36 +0000 (+0000)
Subject: Backport r1308718 to 2.2 and rebuild.
X-Git-Tag: 2.2.23~198
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=622322666f3810dc3ddd2abf3c6578707a078e9b;p=thirdparty%2Fapache%2Fhttpd.git

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 e445e536247..e68eb6d6841 100644
--- 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 45d91b72405..522dcf35ea7 100644
--- 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">