diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java index ccbd86ff79c1e..18e13224ca05c 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java @@ -647,7 +647,7 @@ public DBCQueryTransformer createQueryTransformer(@NotNull DBCQueryTransformType if (type == DBCQueryTransformType.RESULT_SET_LIMIT) { return new QueryTransformerLimit(); } else if (type == DBCQueryTransformType.FETCH_ALL_TABLE) { - return new QueryTransformerFetchAll(); + return new QueryTransformerFetchAll(this); } return super.createQueryTransformer(type); } diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/QueryTransformerFetchAll.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/QueryTransformerFetchAll.java index a855c13c6c7bc..cb093684872f7 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/QueryTransformerFetchAll.java +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/QueryTransformerFetchAll.java @@ -29,6 +29,12 @@ */ class QueryTransformerFetchAll implements DBCQueryTransformer { + final MySQLDataSource dataSource; + + QueryTransformerFetchAll(MySQLDataSource dataSource) { + this.dataSource = dataSource; + } + @Override public void setParameters(Object... parameters) { @@ -43,7 +49,9 @@ public String transformQueryString(SQLQuery query) throws DBCException { public void transformStatement(DBCStatement statement, int parameterIndex) throws DBCException { // Set fetch size to Integer.MIN_VALUE to enable result set streaming try { - ((Statement)statement).setFetchSize(Integer.MIN_VALUE); + if (!dataSource.isMariaDB()) { + ((Statement) statement).setFetchSize(Integer.MIN_VALUE); + } } catch (SQLException e) { throw new DBCException(e, statement.getSession().getExecutionContext()); }