diff options
| -rwxr-xr-x | hsqldb/makefile.mk | 5 | ||||
| -rw-r--r-- | hsqldb/patches/accumulated_patches.patch | 10 | ||||
| -rw-r--r-- | hsqldb/patches/index.txt | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index dcf57bdd8cb6..82b46115bd9e 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -52,9 +52,10 @@ TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) TARFILE_ROOTDIR=hsqldb -CONVERTFILES=build$/build.xml +CONVERTFILES=build$/build.xml \ + src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java -# PATCH_FILE_NAME=patches$/accumulated_patches.patch +PATCH_FILE_NAME=patches$/accumulated_patches.patch # ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \ # src$/org$/hsqldb$/TxManager.java \ diff --git a/hsqldb/patches/accumulated_patches.patch b/hsqldb/patches/accumulated_patches.patch index e69de29bb2d1..9703b89613d4 100644 --- a/hsqldb/patches/accumulated_patches.patch +++ b/hsqldb/patches/accumulated_patches.patch @@ -0,0 +1,10 @@ +--- misc/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2008-03-17 17:05:41.000000000 +0100 ++++ misc/build/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2009-01-21 13:09:24.493470142 +0100 +@@ -429,6 +429,7 @@ + setProperty(hsqldb_log_size, 10); + setProperty(sql_enforce_strict_size, true); + setProperty(hsqldb_nio_data_file, false); ++ setProperty(hsqldb_lock_file, true); + } + + // OOo end diff --git a/hsqldb/patches/index.txt b/hsqldb/patches/index.txt index 2189e8138332..a7a06fc97984 100644 --- a/hsqldb/patches/index.txt +++ b/hsqldb/patches/index.txt @@ -11,6 +11,7 @@ Issue ----- http://www.openoffice.org/issues/show_bug.cgi?id=????? http://www.openoffice.org/issues/show_bug.cgi?id=85087 + http://www.openoffice.org/issues/show_bug.cgi?id=97032 <summary> |