Connector/J commit: r6604 - branches/branch_5_1/connector-j/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_1/connector-j/src/com/mysql/jdbc/ConnectionPropertiesImpl.java
Log:
Post merge fixup, putting back removed properties.

Modified: branches/branch_5_1/connector-j/src/com/mysql/jdbc/ConnectionPropertiesImpl.java
===================================================================
---
branches/branch_5_1/connector-j/src/com/mysql/jdbc/ConnectionPropertiesImpl.java	2007-10-03
14:58:39 UTC (rev 6603)
+++
branches/branch_5_1/connector-j/src/com/mysql/jdbc/ConnectionPropertiesImpl.java	2007-10-03
15:13:11 UTC (rev 6604)
@@ -755,6 +755,11 @@
 			Messages.getString("ConnectionProperties.blobSendChunkSize"), //$NON-NLS-1$
 			"3.1.9", PERFORMANCE_CATEGORY, Integer.MIN_VALUE); //$NON-NLS-1$
 	
+	private BooleanConnectionProperty autoSlowLog = new BooleanConnectionProperty(
+			"autoSlowLog", true,
+			Messages.getString("ConnectionProperties.autoSlowLog"),
+			"5.1.4", DEBUGING_PROFILING_CATEGORY, Integer.MIN_VALUE);
+	
 	private BooleanConnectionProperty blobsAreStrings = new BooleanConnectionProperty(
             "blobsAreStrings", false,
             "Should the driver always treat BLOBs as Strings - specifically to work
around dubious metadata "
@@ -843,6 +848,12 @@
 			Messages.getString("ConnectionProperties.connectionCollation"), //$NON-NLS-1$
 			"3.0.13", MISC_CATEGORY, 7); //$NON-NLS-1$
 
+	private StringConnectionProperty connectionLifecycleInterceptors = new
StringConnectionProperty(
+			"connectionLifecycleInterceptors", //$NON-NLS-1$
+			null,
+			Messages.getString("ConnectionProperties.connectionLifecycleInterceptors"),
+			"5.1.4", CONNECTION_AND_AUTH_CATEGORY, Integer.MAX_VALUE);
+
 	private IntegerConnectionProperty connectTimeout = new IntegerConnectionProperty(
 			"connectTimeout", 0, 0, Integer.MAX_VALUE, //$NON-NLS-1$
 			Messages.getString("ConnectionProperties.connectTimeout"), //$NON-NLS-1$
@@ -4256,4 +4267,20 @@
     public void setFunctionsNeverReturnBlobs(boolean flag) {
         this.functionsNeverReturnBlobs.setValue(flag);
     }
+
+	public boolean getAutoSlowLog() {
+		return this.autoSlowLog.getValueAsBoolean();
+	}
+
+	public void setAutoSlowLog(boolean flag) {
+		this.autoSlowLog.setValue(flag);
+	}
+
+	public String getConnectionLifecycleInterceptors() {
+		return this.connectionLifecycleInterceptors.getValueAsString();
+	}
+
+	public void setConnectionLifecycleInterceptors(String interceptors) {
+		this.connectionLifecycleInterceptors.setValue(interceptors);
+    }
 }