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
746 mark@stripped 2008-10-20
Copyright updates
modified:
build.xml
745 mark@stripped 2008-10-20
Copyright changes
added:
.settings/org.eclipse.core.resources.prefs
modified:
README
src/com/mysql/jdbc/AssertionFailedException.java
src/com/mysql/jdbc/BalanceStrategy.java
src/com/mysql/jdbc/BestResponseTimeBalanceStrategy.java
src/com/mysql/jdbc/Blob.java
src/com/mysql/jdbc/BlobFromLocator.java
src/com/mysql/jdbc/Buffer.java
src/com/mysql/jdbc/BufferRow.java
src/com/mysql/jdbc/ByteArrayRow.java
src/com/mysql/jdbc/CachedResultSetMetaData.java
src/com/mysql/jdbc/CallableStatement.java
src/com/mysql/jdbc/CharsetMapping.java
src/com/mysql/jdbc/Clob.java
src/com/mysql/jdbc/CommunicationsException.java
src/com/mysql/jdbc/CompressedInputStream.java
src/com/mysql/jdbc/Connection.java
src/com/mysql/jdbc/ConnectionFeatureNotAvailableException.java
src/com/mysql/jdbc/ConnectionImpl.java
src/com/mysql/jdbc/ConnectionLifecycleInterceptor.java
src/com/mysql/jdbc/ConnectionProperties.java
src/com/mysql/jdbc/ConnectionPropertiesImpl.java
src/com/mysql/jdbc/ConnectionPropertiesTransform.java
src/com/mysql/jdbc/Constants.java
src/com/mysql/jdbc/DatabaseMetaData.java
src/com/mysql/jdbc/DatabaseMetaDataUsingInfoSchema.java
src/com/mysql/jdbc/Driver.java
src/com/mysql/jdbc/EscapeProcessor.java
src/com/mysql/jdbc/EscapeProcessorResult.java
src/com/mysql/jdbc/EscapeTokenizer.java
src/com/mysql/jdbc/ExportControlled.java
src/com/mysql/jdbc/Extension.java
src/com/mysql/jdbc/Field.java
src/com/mysql/jdbc/IterateBlock.java
src/com/mysql/jdbc/JDBC4CallableStatement.java
src/com/mysql/jdbc/JDBC4ClientInfoProvider.java
src/com/mysql/jdbc/JDBC4ClientInfoProviderSP.java
src/com/mysql/jdbc/JDBC4CommentClientInfoProvider.java
src/com/mysql/jdbc/JDBC4Connection.java
src/com/mysql/jdbc/JDBC4DatabaseMetaData.java
src/com/mysql/jdbc/JDBC4DatabaseMetaDataUsingInfoSchema.java
src/com/mysql/jdbc/JDBC4MysqlSQLXML.java
src/com/mysql/jdbc/JDBC4NClob.java
src/com/mysql/jdbc/JDBC4PreparedStatement.java
src/com/mysql/jdbc/JDBC4ResultSet.java
src/com/mysql/jdbc/JDBC4ServerPreparedStatement.java
src/com/mysql/jdbc/JDBC4UpdatableResultSet.java
src/com/mysql/jdbc/LicenseConfiguration.java
src/com/mysql/jdbc/LoadBalancingConnectionProxy.java
src/com/mysql/jdbc/Messages.java
src/com/mysql/jdbc/MiniAdmin.java
src/com/mysql/jdbc/MysqlDataTruncation.java
src/com/mysql/jdbc/MysqlDefs.java
src/com/mysql/jdbc/MysqlErrorNumbers.java
src/com/mysql/jdbc/MysqlIO.java
src/com/mysql/jdbc/MysqlParameterMetadata.java
src/com/mysql/jdbc/MysqlSavepoint.java
src/com/mysql/jdbc/NamedPipeSocketFactory.java
src/com/mysql/jdbc/NonRegisteringDriver.java
src/com/mysql/jdbc/NonRegisteringReplicationDriver.java
src/com/mysql/jdbc/NotImplemented.java
src/com/mysql/jdbc/NotUpdatable.java
src/com/mysql/jdbc/OutputStreamWatcher.java
src/com/mysql/jdbc/PacketTooBigException.java
src/com/mysql/jdbc/ParameterBindings.java
src/com/mysql/jdbc/PingTarget.java
src/com/mysql/jdbc/PreparedStatement.java
src/com/mysql/jdbc/RandomBalanceStrategy.java
src/com/mysql/jdbc/ReplicationConnection.java
src/com/mysql/jdbc/ReplicationDriver.java
src/com/mysql/jdbc/ResultSetImpl.java
src/com/mysql/jdbc/ResultSetInternalMethods.java
src/com/mysql/jdbc/ResultSetMetaData.java
src/com/mysql/jdbc/ResultSetRow.java
src/com/mysql/jdbc/RowData.java
src/com/mysql/jdbc/RowDataCursor.java
src/com/mysql/jdbc/RowDataDynamic.java
src/com/mysql/jdbc/RowDataStatic.java
src/com/mysql/jdbc/SQLError.java
src/com/mysql/jdbc/Security.java
src/com/mysql/jdbc/ServerPreparedStatement.java
src/com/mysql/jdbc/SingleByteCharsetConverter.java
src/com/mysql/jdbc/SocketFactory.java
src/com/mysql/jdbc/StandardSocketFactory.java
src/com/mysql/jdbc/Statement.java
src/com/mysql/jdbc/StatementImpl.java
src/com/mysql/jdbc/StatementInterceptor.java
src/com/mysql/jdbc/StreamingNotifiable.java
src/com/mysql/jdbc/StringUtils.java
src/com/mysql/jdbc/TimeUtil.java
src/com/mysql/jdbc/UpdatableResultSet.java
src/com/mysql/jdbc/Util.java
src/com/mysql/jdbc/WatchableOutputStream.java
src/com/mysql/jdbc/WatchableWriter.java
src/com/mysql/jdbc/WriterWatcher.java
src/com/mysql/jdbc/exceptions/DeadlockTimeoutRollbackMarker.java
src/com/mysql/jdbc/exceptions/MySQLDataException.java
src/com/mysql/jdbc/exceptions/MySQLIntegrityConstraintViolationException.java
src/com/mysql/jdbc/exceptions/MySQLInvalidAuthorizationSpecException.java
src/com/mysql/jdbc/exceptions/MySQLNonTransientConnectionException.java
src/com/mysql/jdbc/exceptions/MySQLNonTransientException.java
src/com/mysql/jdbc/exceptions/MySQLStatementCancelledException.java
src/com/mysql/jdbc/exceptions/MySQLSyntaxErrorException.java
src/com/mysql/jdbc/exceptions/MySQLTimeoutException.java
src/com/mysql/jdbc/exceptions/MySQLTransactionRollbackException.java
src/com/mysql/jdbc/exceptions/MySQLTransientConnectionException.java
src/com/mysql/jdbc/exceptions/MySQLTransientException.java
src/com/mysql/jdbc/exceptions/jdbc4/CommunicationsException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLDataException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLIntegrityConstraintViolationException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLInvalidAuthorizationSpecException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLNonTransientConnectionException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLNonTransientException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLSyntaxErrorException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLTimeoutException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLTransactionRollbackException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLTransientConnectionException.java
src/com/mysql/jdbc/exceptions/jdbc4/MySQLTransientException.java
src/com/mysql/jdbc/integration/c3p0/MysqlConnectionTester.java
src/com/mysql/jdbc/integration/jboss/ExtendedMysqlExceptionSorter.java
src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java
src/com/mysql/jdbc/interceptors/ResultSetScannerInterceptor.java
src/com/mysql/jdbc/interceptors/ServerStatusDiffInterceptor.java
src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
src/com/mysql/jdbc/jdbc2/optional/JDBC4CallableStatementWrapper.java
src/com/mysql/jdbc/jdbc2/optional/JDBC4ConnectionWrapper.java
src/com/mysql/jdbc/jdbc2/optional/JDBC4MysqlPooledConnection.java
src/com/mysql/jdbc/jdbc2/optional/JDBC4MysqlXAConnection.java
src/com/mysql/jdbc/jdbc2/optional/JDBC4PreparedStatementWrapper.java
src/com/mysql/jdbc/jdbc2/optional/JDBC4StatementWrapper.java
src/com/mysql/jdbc/jdbc2/optional/JDBC4SuspendableXAConnection.java
src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java
src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
src/com/mysql/jdbc/jdbc2/optional/MysqlDataSourceFactory.java
src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java
src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java
src/com/mysql/jdbc/jdbc2/optional/MysqlXAException.java
src/com/mysql/jdbc/jdbc2/optional/MysqlXid.java
src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
src/com/mysql/jdbc/jdbc2/optional/WrapperBase.java
src/com/mysql/jdbc/log/CommonsLogger.java
src/com/mysql/jdbc/log/Jdk14Logger.java
src/com/mysql/jdbc/log/Log.java
src/com/mysql/jdbc/log/Log4JLogger.java
src/com/mysql/jdbc/log/LogFactory.java
src/com/mysql/jdbc/log/LogUtils.java
src/com/mysql/jdbc/log/NullLogger.java
src/com/mysql/jdbc/log/StandardLogger.java
src/com/mysql/jdbc/profiler/LoggingProfilerEventHandler.java
src/com/mysql/jdbc/profiler/ProfilerEvent.java
src/com/mysql/jdbc/profiler/ProfilerEventHandler.java
src/com/mysql/jdbc/profiler/ProfilerEventHandlerFactory.java
src/com/mysql/jdbc/util/BaseBugReport.java
src/com/mysql/jdbc/util/ErrorMappingsDocGenerator.java
src/com/mysql/jdbc/util/LRUCache.java
src/com/mysql/jdbc/util/PropertiesDocGenerator.java
src/com/mysql/jdbc/util/ReadAheadInputStream.java
src/com/mysql/jdbc/util/ResultSetUtil.java
src/com/mysql/jdbc/util/ServerController.java
src/com/mysql/jdbc/util/TimezoneDump.java
src/com/mysql/jdbc/util/VersionFSHierarchyMaker.java
src/lib-nodist/LICENSE.mysql
src/lib-nodist/commercialLicense.txt
src/org/gjt/mm/mysql/Driver.java
src/testsuite/BaseTestCase.java
src/testsuite/UnreliableSocketFactory.java
src/testsuite/perf/BasePerfTest.java
src/testsuite/perf/LoadStorePerfTest.java
src/testsuite/perf/RetrievalPerfTest.java
src/testsuite/regression/AppletRegressionTest.java
src/testsuite/regression/BlobRegressionTest.java
src/testsuite/regression/CachedRowsetTest.java
src/testsuite/regression/CallableStatementRegressionTest.java
src/testsuite/regression/ConnectionRegressionTest.java
src/testsuite/regression/DataSourceRegressionTest.java
src/testsuite/regression/EscapeProcessorRegressionTest.java
src/testsuite/regression/MetaDataRegressionTest.java
src/testsuite/regression/MicroPerformanceRegressionTest.java
src/testsuite/regression/NumbersRegressionTest.java
src/testsuite/regression/PooledConnectionRegressionTest.java
src/testsuite/regression/ResultSetRegressionTest.java
src/testsuite/regression/StatementRegressionTest.java
src/testsuite/regression/StressRegressionTest.java
src/testsuite/regression/StringRegressionTest.java
src/testsuite/regression/SubqueriesRegressionTest.java
src/testsuite/simple/BlobTest.java
src/testsuite/simple/CallableStatementTest.java
src/testsuite/simple/CharsetTests.java
src/testsuite/simple/ConnectionTest.java
src/testsuite/simple/DataSourceTest.java
src/testsuite/simple/DateTest.java
src/testsuite/simple/EscapeProcessingTest.java
src/testsuite/simple/MetadataTest.java
src/testsuite/simple/MiniAdminTest.java
src/testsuite/simple/NumbersTest.java
src/testsuite/simple/ResultSetTest.java
src/testsuite/simple/SSLTest.java
src/testsuite/simple/ServerControllerTest.java
src/testsuite/simple/SimpleTransformer.java
src/testsuite/simple/StatementsTest.java
src/testsuite/simple/TransactionTest.java
src/testsuite/simple/TraversalTest.java
src/testsuite/simple/UpdatabilityTest.java
src/testsuite/simple/XATest.java
src/testsuite/simple/jdbc4/StatementsTest.java
=== modified file 'build.xml'
--- a/build.xml 2008-06-03 15:44:40 +0000
+++ b/build.xml 2008-10-21 01:47:52 +0000
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!--
- Copyright (C) 2002-2007 MySQL AB
+ Copyright (C) 2002-2007 MySQL AB, 2008 Sun Microsystems
This program is free software; you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License as
=== modified file 'src/com/mysql/jdbc/ConnectionProperties.java'
--- a/src/com/mysql/jdbc/ConnectionProperties.java 2008-10-20 22:29:45 +0000
+++ b/src/com/mysql/jdbc/ConnectionProperties.java 2008-10-21 01:48:11 +0000
@@ -1614,4 +1614,8 @@ public interface ConnectionProperties {
public void setPasswordCharacterEncoding(String characterSet);
public String getPasswordCharacterEncoding();
+
+ public int getLoadBalanceBlacklistTimeout();
+
+ public void setLoadBalanceBlacklistTimeout(int loadBalanceBlacklistTimeout);
}
=== modified file 'src/com/mysql/jdbc/ConnectionPropertiesImpl.java'
--- a/src/com/mysql/jdbc/ConnectionPropertiesImpl.java 2008-10-20 22:29:45 +0000
+++ b/src/com/mysql/jdbc/ConnectionPropertiesImpl.java 2008-10-21 01:48:11 +0000
@@ -4425,13 +4425,12 @@ public class ConnectionPropertiesImpl im
this.compensateOnDuplicateKeyUpdateCounts.setValue(flag);
}
- public IntegerConnectionProperty getLoadBalanceBlacklistTimeout() {
- return loadBalanceBlacklistTimeout;
+ public int getLoadBalanceBlacklistTimeout() {
+ return loadBalanceBlacklistTimeout.getValueAsInt();
}
- public void setLoadBalanceBlacklistTimeout(
- IntegerConnectionProperty loadBalanceBlacklistTimeout) {
- this.loadBalanceBlacklistTimeout = loadBalanceBlacklistTimeout;
+ public void setLoadBalanceBlacklistTimeout(int loadBalanceBlacklistTimeout) {
+ this.loadBalanceBlacklistTimeout.setValue(loadBalanceBlacklistTimeout);
}
public void setRetriesAllDown(IntegerConnectionProperty retriesAllDown) {
=== modified file 'src/com/mysql/jdbc/ReplicationConnection.java'
--- a/src/com/mysql/jdbc/ReplicationConnection.java 2008-10-20 22:29:45 +0000
+++ b/src/com/mysql/jdbc/ReplicationConnection.java 2008-10-21 01:48:11 +0000
@@ -2375,4 +2375,12 @@ public class ReplicationConnection imple
public int getAutoIncrementIncrement() {
return this.currentConnection.getAutoIncrementIncrement();
}
+
+ public int getLoadBalanceBlacklistTimeout() {
+ return this.currentConnection.getLoadBalanceBlacklistTimeout();
+ }
+
+ public void setLoadBalanceBlacklistTimeout(int loadBalanceBlacklistTimeout) {
+ this.currentConnection.setLoadBalanceBlacklistTimeout(loadBalanceBlacklistTimeout);
+ }
}
=== modified file 'src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java'
--- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2008-10-20 22:29:45 +0000
+++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2008-10-21 01:48:11 +0000
@@ -2583,4 +2583,12 @@ public class ConnectionWrapper extends W
public int getAutoIncrementIncrement() {
return this.mc.getAutoIncrementIncrement();
}
+
+ public int getLoadBalanceBlacklistTimeout() {
+ return this.mc.getLoadBalanceBlacklistTimeout();
+ }
+
+ public void setLoadBalanceBlacklistTimeout(int loadBalanceBlacklistTimeout) {
+ this.mc.setLoadBalanceBlacklistTimeout(loadBalanceBlacklistTimeout);
+ }
}
| Thread |
|---|
| • bzr push into connector-j/branches/branch_5_1 branch (mark:745 to 747) | mark | 21 Oct |
