summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-17 15:39:54 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-17 15:39:54 +0000
commit919ed9efc7ea458e9beb017218509e296f650920 (patch)
tree9efd1af1020941d798dddb348fd2c0ca00a37a22
parente2367a28a0a6b2f70565c8301131ea39546075f7 (diff)
CWS-TOOLING: integrate CWS dba31h
2009-01-29 10:47:07 +0100 oj r267102 : decl OpCodeMap as friend 2009-01-26 09:41:21 +0100 fs r266905 : #i97137# 2009-01-26 09:10:39 +0100 fs r266903 : #i10000 2009-01-26 09:00:17 +0100 fs r266901 : re-enable user admin for MySQL native 2009-01-23 21:56:08 +0100 fs r266851 : #i97137# 2009-01-23 21:32:40 +0100 fs r266850 : #i97042# 2009-01-23 11:23:59 +0100 msc r266800 : #i98387# 2009-01-23 11:17:05 +0100 msc r266798 : #i98387# 2009-01-23 10:56:33 +0100 fs r266795 : for the moment, disable user administration for MySQL native 2009-01-21 15:08:54 +0100 fs r266672 : removed some advanced settings for MySQL native - letting the user control them does not make sense for this particular type 2009-01-21 13:55:13 +0100 oj r266668 : #i98317# wrong var set 2009-01-21 13:41:22 +0100 fs r266664 : #i98315# 2009-01-21 13:13:09 +0100 oj r266661 : #i97032# enable locking for OOo 2009-01-21 13:11:26 +0100 oj r266660 : #i97032# enable locking for OOo 2009-01-21 10:10:50 +0100 oj r266634 : #i98174# merge conflict resolved 2009-01-21 08:48:58 +0100 fs r266628 : CWS-TOOLING: rebase CWS dba31h to trunk@266428 (milestone: DEV300:m39) 2009-01-20 12:54:32 +0100 fs r266570 : #i98277# 2009-01-19 10:46:31 +0100 fs r266480 : #i97995# 2009-01-19 08:42:09 +0100 fs r266470 : #i97042# provided my mod@openoffice.org: support more SQL comment styles 2009-01-19 07:55:43 +0100 oj r266468 : #i98115# check function name as well 2009-01-16 10:21:28 +0100 oj r266404 : #i97861# remove invalid assertion 2009-01-16 10:18:31 +0100 oj r266403 : #i97861# ini var with false 2009-01-15 14:09:50 +0100 oj r266371 : #i97810# saveas fix 2009-01-15 11:54:18 +0100 oj r266360 : remove : from mysql 2009-01-15 11:07:46 +0100 oj r266355 : insert JNI fixes for method names 2009-01-15 10:54:44 +0100 oj r266351 : fix for parameter subst 2009-01-14 14:41:34 +0100 oj r266308 : parameter subst 2009-01-14 14:40:20 +0100 oj r266307 : add missing try catch 2009-01-14 14:38:34 +0100 oj r266306 : new service for parameter subst 2009-01-14 14:37:52 +0100 oj r266305 : missing types for hyper 2009-01-09 15:28:36 +0100 fs r266090 : #i97889# 2009-01-09 14:16:15 +0100 fs r266082 : #i97892# provided by npower: when reading the xlink:href attrib, use the graphic resolver only if appropriate 2009-01-08 21:31:21 +0100 fs r266041 : #i97346# 2009-01-08 14:51:56 +0100 fs r266012 : #i97871# showPreviewFor: bail out if preview is disabled
-rwxr-xr-xhsqldb/makefile.mk5
-rw-r--r--hsqldb/patches/accumulated_patches.patch10
-rw-r--r--hsqldb/patches/index.txt1
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>