summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2012-07-03 20:00:06 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-07-04 09:22:23 +0200
commitc395f40ee81aa6419dc5ff8d0b6c7ea46a807038 (patch)
tree52c4af780e7e0b79dee88a5423bb9ff1e1c12c9f
parent7f2bea49b3871443608ca7639f9b601fbb9d37b6 (diff)
fdo#36824 hsqldb properly escape automatically built names
Change-Id: Id2c36fb24d1f7c8f8e9800c10226323594bb766e Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
-rwxr-xr-xhsqldb/makefile.mk3
-rw-r--r--hsqldb/patches/fdo36824.patch11
2 files changed, 13 insertions, 1 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index e5004622ca4d..3692403278fb 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -58,7 +58,8 @@ CONVERTFILES=build$/build.xml \
PATCH_FILES=patches$/i96823.patch \
patches$/i97032.patch \
patches$/i103528.patch \
- patches$/i104901.patch
+ patches$/i104901.patch \
+ patches$/fdo36824.patch
.IF "$(JAVANUMVER:s/.//)" >= "000100060000"
PATCH_FILES+= \
diff --git a/hsqldb/patches/fdo36824.patch b/hsqldb/patches/fdo36824.patch
new file mode 100644
index 000000000000..ad753e335bad
--- /dev/null
+++ b/hsqldb/patches/fdo36824.patch
@@ -0,0 +1,11 @@
+--- misc/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:49:00.000000000 +0200
++++ misc/build/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:39:00.000000000 +0200
+@@ -1552,7 +1552,7 @@
+ return columnQuoted;
+ }
+
+- return false;
++ return true;
+ }
+
+ /**