Skip to content

Commit 18fe403

Browse files
committed
Merge branch 'master' into develop
2 parents c234b04 + 7ddcd9e commit 18fe403

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ or maven :
2626
<dependency>
2727
<groupId>org.mariadb.jdbc</groupId>
2828
<artifactId>mariadb-java-client</artifactId>
29-
<version>3.1.4</version>
29+
<version>3.2.0</version>
3030
</dependency>
3131
```
3232

@@ -45,7 +45,7 @@ Development snapshot are available on sonatype nexus repository
4545
<dependency>
4646
<groupId>org.mariadb.jdbc</groupId>
4747
<artifactId>mariadb-java-client</artifactId>
48-
<version>3.1.5-SNAPSHOT</version>
48+
<version>3.2.1-SNAPSHOT</version>
4949
</dependency>
5050
</dependencies>
5151
```

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ private boolean executeInternalPreparedBatch() throws SQLException {
108108
checkNotClosed();
109109
checkIfInsertCommand();
110110
Configuration conf = con.getContext().getConf();
111-
if (((isCommandInsert && (conf.useBulkStmts() || conf.useBulkStmtsForInserts()))
111+
if (con.getContext().hasServerCapability(STMT_BULK_OPERATIONS)
112+
&& ((isCommandInsert && (conf.useBulkStmts() || conf.useBulkStmtsForInserts()))
112113
|| (!isCommandInsert && conf.useBulkStmts()))
113114
&& batchParameters.size() > 1
114115
&& autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ public void largeBatch() throws SQLException {
289289
useCompression,
290290
useBulkStmtsForInserts);
291291
try (Connection con = createCon(confString)) {
292-
System.out.println("########################################" + confString);
293292
largeBatch(con);
294293
}
295294
}

0 commit comments

Comments
 (0)