summaryrefslogtreecommitdiff
path: root/hsqldb
diff options
context:
space:
mode:
Diffstat (limited to 'hsqldb')
-rwxr-xr-xhsqldb/makefile.mk3
-rw-r--r--hsqldb/patches/accumulated_patches.patch11
2 files changed, 13 insertions, 1 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index fb5bf8a7344b..5732f3ae767c 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -53,7 +53,8 @@ TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
TARFILE_ROOTDIR=hsqldb
CONVERTFILES=build$/build.xml \
- src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java
+ src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \
+ src$/org$/hsqldb$/Library.java
PATCH_FILES=patches$/accumulated_patches.patch
diff --git a/hsqldb/patches/accumulated_patches.patch b/hsqldb/patches/accumulated_patches.patch
index 42f1ef04b850..f7d341a9996f 100644
--- a/hsqldb/patches/accumulated_patches.patch
+++ b/hsqldb/patches/accumulated_patches.patch
@@ -102,3 +102,14 @@
}
// OOo end
+--- misc/hsqldb/src/org/hsqldb/Library.java
++++ misc/build/hsqldb/src/org/hsqldb/Library.java
+@@ -1957,7 +1957,7 @@
+ functionMap.put("bitand", bitand);
+ functionMap.put("bitlength", bitLength);
+ functionMap.put("bitor", bitor);
+- functionMap.put("bitxor", bitor);
++ functionMap.put("bitxor", bitxor);
+ functionMap.put("character", character);
+ functionMap.put("concat", concat);
+ functionMap.put("cot", cot);