[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/hsqldb

[Julien Nabet]

 external/hsqldb/UnpackedTarball_hsqldb.mk        |    1 +
 external/hsqldb/patches/multipleResultSets.patch |   11 +++++++++++
 2 files changed, 12 insertions(+)

New commits:
commit 46980ee24a04f6bcc9ace4217f6b6c929adb0625
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Feb 22 21:33:20 2018 +0100

    tdf#115828: hsqldb supports multiple resultSets
    
    Regression from 3c567e55e6aed9e0da892d8b9fc09f8a0c784fcc
    Thank you to Lionel for this suggestion
    
    Change-Id: I5eeadc1968e57d586e55a7aa5488b2ab3ee43724
    Reviewed-on: https://gerrit.libreoffice.org/50202
    (cherry picked from commit 856159b3913976c68c8a04b7e939a6cc64477f6a)
    Reviewed-on: https://gerrit.libreoffice.org/50267
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
index 0906647f5260..fc6c18f77c23 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
 	external/hsqldb/patches/limit_as_table_alias.patch \
 	$(if $(HSQLDB_USE_JDBC_4_1),\
 		external/hsqldb/patches/jdbc-4.1.patch \
+		external/hsqldb/patches/multipleResultSets.patch \
 	) \
 ))
 
diff --git a/external/hsqldb/patches/multipleResultSets.patch b/external/hsqldb/patches/multipleResultSets.patch
new file mode 100644
index 000000000000..56ddb13b449a
--- /dev/null
+++ b/external/hsqldb/patches/multipleResultSets.patch
@@ -0,0 +1,11 @@
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java	2012-02-08 15:14:42.802123563 +0000
++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java	2012-02-08 15:47:35.835635654 +0000
+@@ -1347,7 +1347,7 @@
+      * @exception SQLException if a database access error occurs
+      */
+     public boolean supportsMultipleResultSets() throws SQLException {
+-        return false;
++        return true;
+     }
+
+     /**