bzr push into connector-j/branches/branch_5_1 branch (mark:747 to 748)

[mark]

  748 mark@stripped	2008-10-20
      More properties accessors missed.
modified:
  src/com/mysql/jdbc/ConnectionProperties.java
  src/com/mysql/jdbc/ConnectionPropertiesImpl.java
  src/com/mysql/jdbc/ReplicationConnection.java
  src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java

  747 mark@stripped	2008-10-20
      Blacklist timeout accessors/mutators
modified:
  src/com/mysql/jdbc/ConnectionProperties.java
  src/com/mysql/jdbc/ConnectionPropertiesImpl.java
  src/com/mysql/jdbc/ReplicationConnection.java
  src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java

=== modified file 'src/com/mysql/jdbc/ConnectionProperties.java'
--- a/src/com/mysql/jdbc/ConnectionProperties.java	2008-10-21 01:48:11 +0000
+++ b/src/com/mysql/jdbc/ConnectionProperties.java	2008-10-21 01:56:41 +0000
@@ -1607,15 +1607,19 @@ public interface ConnectionProperties {
 
 	public abstract void setCompensateOnDuplicateKeyUpdateCounts(boolean flag);
 	
-	public void setUseAffectedRows(boolean flag);
+	public abstract void setUseAffectedRows(boolean flag);
 
-	public boolean getUseAffectedRows();
+	public abstract boolean getUseAffectedRows();
 	
-	public void setPasswordCharacterEncoding(String characterSet);
+	public abstract void setPasswordCharacterEncoding(String characterSet);
 
-	public String getPasswordCharacterEncoding();
+	public abstract String getPasswordCharacterEncoding();
 	
-	public int getLoadBalanceBlacklistTimeout();
+	public abstract int getLoadBalanceBlacklistTimeout();
 
-	public void setLoadBalanceBlacklistTimeout(int loadBalanceBlacklistTimeout);
+	public abstract void setLoadBalanceBlacklistTimeout(int loadBalanceBlacklistTimeout);
+	
+	public abstract void setRetriesAllDown(int retriesAllDown);
+	
+	public abstract int getRetriesAllDown();
 }

=== modified file 'src/com/mysql/jdbc/ConnectionPropertiesImpl.java'
--- a/src/com/mysql/jdbc/ConnectionPropertiesImpl.java	2008-10-21 01:48:11 +0000
+++ b/src/com/mysql/jdbc/ConnectionPropertiesImpl.java	2008-10-21 01:56:41 +0000
@@ -4433,8 +4433,12 @@ public class ConnectionPropertiesImpl im
 		this.loadBalanceBlacklistTimeout.setValue(loadBalanceBlacklistTimeout);
 	}
 	
-	public void setRetriesAllDown(IntegerConnectionProperty retriesAllDown) {
-		this.retriesAllDown = retriesAllDown;
+	public void setRetriesAllDown(int retriesAllDown) {
+		this.retriesAllDown.setValue(retriesAllDown);
+	}
+	
+	public int getRetriesAllDown() {
+		return this.retriesAllDown.getValueAsInt();
 	}
 
 	public void setUseAffectedRows(boolean flag) {

=== modified file 'src/com/mysql/jdbc/ReplicationConnection.java'
--- a/src/com/mysql/jdbc/ReplicationConnection.java	2008-10-21 01:48:11 +0000
+++ b/src/com/mysql/jdbc/ReplicationConnection.java	2008-10-21 01:56:41 +0000
@@ -2383,4 +2383,12 @@ public class ReplicationConnection imple
 	public void setLoadBalanceBlacklistTimeout(int loadBalanceBlacklistTimeout) {
 		this.currentConnection.setLoadBalanceBlacklistTimeout(loadBalanceBlacklistTimeout);
 	}
+
+	public int getRetriesAllDown() {
+		return this.currentConnection.getRetriesAllDown();
+	}
+
+	public void setRetriesAllDown(int retriesAllDown) {
+		this.currentConnection.setRetriesAllDown(retriesAllDown);
+	}
 }

=== modified file 'src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java'
--- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java	2008-10-21 01:48:11 +0000
+++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java	2008-10-21 01:56:41 +0000
@@ -2591,4 +2591,12 @@ public class ConnectionWrapper extends W
 	public void setLoadBalanceBlacklistTimeout(int loadBalanceBlacklistTimeout) {
 		this.mc.setLoadBalanceBlacklistTimeout(loadBalanceBlacklistTimeout);
 	}
+	
+	public void setRetriesAllDown(int retriesAllDown) {
+		this.mc.setRetriesAllDown(retriesAllDown);
+	}
+	
+	public int getRetriesAllDown() {
+		return this.mc.getRetriesAllDown();
+	}
 }