[Libreoffice-commits] .: Branch 'libreoffice-3-5' - hsqldb/makefile.mk hsqldb/patches

[Miklos Vajna]

 hsqldb/makefile.mk            |    3 ++-
 hsqldb/patches/fdo36824.patch |   11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit c395f40ee81aa6419dc5ff8d0b6c7ea46a807038
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jul 3 20:00:06 2012 +0200

    fdo#36824 hsqldb properly escape automatically built names
    
    Change-Id: Id2c36fb24d1f7c8f8e9800c10226323594bb766e
    
    Signed-off-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index e500462..3692403 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 0000000..ad753e3
--- /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;
+     }
+ 
+     /**