Skip to content

Commit f181df2

Browse files
committed
[misc] change technical option enableServerTimeout to canUseServerTimeout
1 parent 56f6b7a commit f181df2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/java/org/mariadb/jdbc/Connection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public Connection(Configuration conf, ClosableLock lock, Client client) {
7676
context.getVersion().isMariaDBServer()
7777
&& context.getVersion().versionGreaterOrEqual(10, 1, 2)
7878
&& Boolean.parseBoolean(
79-
conf.nonMappedOptions().getProperty("enableServerTimeout", "true"));
79+
conf.nonMappedOptions().getProperty("canUseServerTimeout", "true"));
8080
this.queryTimeoutHandler =
8181
this.canUseServerTimeout
8282
? NoOpQueryTimeoutHandler.INSTANCE

src/test/java/org/mariadb/jdbc/integration/StatementTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ public void maxRows() throws SQLException {
632632
}
633633
assertEquals(10, i);
634634

635-
try (Connection conn = createCon("&enableServerTimeout=false")) {
635+
try (Connection conn = createCon("&canUseServerTimeout=false")) {
636636
Statement stmt2 = conn.createStatement();
637637
stmt2.setQueryTimeout(2);
638638
stmt2.setMaxRows(10);

0 commit comments

Comments
 (0)