Connector/J commit: r4380 - branches/branch_5_0/connector-j/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/ConnectionProperties.java
Log:
Merged wording changes for autoReconnect property from 3.1 branch.

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/ConnectionProperties.java
===================================================================
---
branches/branch_5_0/connector-j/src/com/mysql/jdbc/ConnectionProperties.java	2005-10-10
21:42:48 UTC (rev 4379)
+++
branches/branch_5_0/connector-j/src/com/mysql/jdbc/ConnectionProperties.java	2005-10-10
21:44:50 UTC (rev 4380)
@@ -639,16 +639,18 @@
 	private boolean autoGenerateTestcaseScriptAsBoolean = false;
 
 	private BooleanConnectionProperty autoReconnect = new BooleanConnectionProperty(
-			"autoReconnect", false,
-			"Should the driver try to re-establish bad connections? " 
-			+ "  If enabled the driver will throw an exception for a query issued on a stale or
dead connection, " +
-			" but will attempt reconnect before the next query issued on the connection. This
feature " +
-			"is not recommended, because it has side effects related to session state and data
consistency when applications don't" +
-			"handle SQLExceptions properly, and is only designed to be used " + 
-			"when you are unable to write your application to handle SQLExceptions resulting from
dead and" +
-			"stale connections properly. Alternatively, investigate setting the MySQL server
variable \"wait_timeout\"" +
-			"to some high value rather than the default of 8 hours.", "1.1",
-			HA_CATEGORY, 0);
+			"autoReconnect",
+			false,
+			"Should the driver try to re-establish stale and/or dead connections? "
+					+ "  If enabled the driver will throw an exception for a queries issued on a stale
or dead connection, "
+					+ " which belong to the current transaction, but will attempt reconnect before the
next query issued on the "
+					+ "connection in a new transaction. The use of this feature "
+					+ "is not recommended, because it has side effects related to session state and data
consistency when applications don't"
+					+ "handle SQLExceptions properly, and is only designed to be used "
+					+ "when you are unable to configure your application to handle SQLExceptions
resulting from dead and"
+					+ "stale connections properly. Alternatively, investigate setting the MySQL server
variable \"wait_timeout\""
+					+ "to some high value rather than the default of 8 hours.",
+			"1.1", HA_CATEGORY, 0);
 
 	private BooleanConnectionProperty autoReconnectForPools = new BooleanConnectionProperty(
 			"autoReconnectForPools",