Skip to content

Commit 2f29c3a

Browse files
author
diego Dupin
committed
[misc] using latest mysql version for benchmark (using option trackSessionState to avoid https://jira.mariadb.org/browse/MDEV-26868 issue)
1 parent 3fa6196 commit 2f29c3a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- env: srv=mariadb v=10.5 local=1
4848
- env: srv=mariadb v=10.6 packet=40
4949
- env: srv=mariadb v=10.6 packet=8
50-
- env: srv=mariadb v=10.6 BENCH=1
50+
- env: srv=mariadb v=10.6 local=1 BENCH=1
5151
- if: type = push AND fork = false
5252
env: srv=maxscale
5353
- if: type = push AND fork = false

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<logback.version>1.3.0-alpha10</logback.version>
2424
<jacoco.version>0.8.7</jacoco.version>
2525
<waffle-jna.version>3.0.0</waffle-jna.version>
26-
<mysql-connector-java.version>8.0.25</mysql-connector-java.version>
26+
<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
2727
</properties>
2828

2929
<licenses>

src/benchmark/java/org/mariadb/jdbc/Common.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void createConnections() throws Exception {
5858
throw new RuntimeException("wrong param");
5959
}
6060
try {
61-
String jdbcBase = "jdbc:%s://%s:%s/%s?user=%s&password=%s&sslMode=DISABLED&useServerPrepStmts=%s&cachePrepStmts=%s&serverTimezone=UTC&%s";
61+
String jdbcBase = "jdbc:%s://%s:%s/%s?user=%s&password=%s&sslMode=DISABLED&useServerPrepStmts=%s&cachePrepStmts=%s&serverTimezone=UTC&trackSessionState=TRUE%s";
6262
String jdbcUrlText =
6363
String.format(
6464
jdbcBase,
@@ -67,6 +67,7 @@ public void createConnections() throws Exception {
6767
String.format(
6868
jdbcBase,
6969
driver, host, port, database, username, password, true, true, other);
70+
7071
connectionText =
7172
((java.sql.Driver) Class.forName(className).getDeclaredConstructor().newInstance())
7273
.connect(jdbcUrlText, new Properties());

0 commit comments

Comments
 (0)