You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/02/28 13:18:45 UTC
[openoffice] 03/03: Integrate patch from upstream
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 69daa5cf4979ecd82d3da8ec28eeaaf87d94bfd5
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Sun Feb 19 20:42:36 2023 +0100
Integrate patch from upstream
(cherry picked from commit 248a2d540f4820a645c8853244fc959fbb9d7a8d)
---
main/hsqldb/makefile.mk | 2 +-
main/hsqldb/patches/script.patch | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/main/hsqldb/makefile.mk b/main/hsqldb/makefile.mk
index 6733b2e273..6f1d193b75 100644
--- a/main/hsqldb/makefile.mk
+++ b/main/hsqldb/makefile.mk
@@ -49,7 +49,7 @@ CONVERTFILES=build$/build.xml \
src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \
src$/org$/hsqldb$/Library.java
-PATCH_FILES=patches$/i121754.patch
+PATCH_FILES=patches$/i121754.patch patches$/script.patch
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
diff --git a/main/hsqldb/patches/script.patch b/main/hsqldb/patches/script.patch
new file mode 100644
index 0000000000..dc722d8198
--- /dev/null
+++ b/main/hsqldb/patches/script.patch
@@ -0,0 +1,13 @@
+diff -ru misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java
+--- misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2008-05-27 14:26:44.000000000 +0200
++++ misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2023-02-19 15:28:44.167555700 +0100
+@@ -402,6 +402,9 @@
+ if (tokenizer.getType() != Types.VARCHAR) {
+ throw Trace.error(Trace.INVALID_IDENTIFIER);
+ }
++ if (session.isProcessingScript() || session.isProcessingLog()) {
++ return new Result(ResultConstants.UPDATECOUNT);
++ }
+
+ dsw = new ScriptWriterText(database, token, true, true, true);
+