diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:53:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:53:14 +0000 |
| commit | 61a1a4aa5dcbe00a62a7729b53e698ebcb967100 (patch) | |
| tree | cfbd3fa058dedf3a46abbba4db2c2e979c8f2143 /hsqldb | |
| parent | 7a3c9be237fbbec4887ba5f1ed995365607d6b1a (diff) | |
INTEGRATION: CWS dba24e_SRC680 (1.1.4); FILE ADDED
2008/01/08 08:42:49 oj 1.1.4.2: #i84196# merge from dba24d
2008/01/08 07:36:36 oj 1.1.4.1: file accumulated_patches.patch was added on branch cws_src680_dba24e on 2008-01-08 08:42:49 +0000
Diffstat (limited to 'hsqldb')
| -rw-r--r-- | hsqldb/patches/accumulated_patches.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/hsqldb/patches/accumulated_patches.patch b/hsqldb/patches/accumulated_patches.patch new file mode 100644 index 000000000000..92fe333da30a --- /dev/null +++ b/hsqldb/patches/accumulated_patches.patch @@ -0,0 +1,57 @@ +*** misc/hsqldb/src/org/hsqldb/persist/DataFileCache.java Sat Oct 6 13:09:49 2007 +--- misc/build/hsqldb/src/org/hsqldb/persist/DataFileCache.java Tue Dec 4 10:16:41 2007 +*************** +*** 244,255 **** + } else { + fileFreePosition = INITIAL_FREE_POS; + +! dataFile.seek(LONG_FREE_POS_POS); +! dataFile.writeLong(INITIAL_FREE_POS); + +! // set unsaved flag; +! dataFile.seek(FLAGS_POS); +! dataFile.writeInt(0); + } + + initBuffers(); +--- 244,258 ---- + } else { + fileFreePosition = INITIAL_FREE_POS; + +! if ( !readonly ) { + +! dataFile.seek(LONG_FREE_POS_POS); +! dataFile.writeLong(INITIAL_FREE_POS); +! +! // set unsaved flag; +! dataFile.seek(FLAGS_POS); +! dataFile.writeInt(0); +! } + } + + initBuffers(); +*** misc/hsqldb/src/org/hsqldb/View.java 2007-07-22 16:34:18.000000000 +0200 +--- misc/build/hsqldb/src/org/hsqldb/View.java 2008-01-08 07:57:29.375000000 +0100 +*************** +*** 218,226 **** + continue; + } + +! expandedStatement.replace(pos, +! expandedStatement.indexOf("*", pos) + 1, +! colList); + } + + statement = expandedStatement.toString(); +--- 218,228 ---- + continue; + } + +! int foundPos = expandedStatement.indexOf("*", pos); +! if ( foundPos != -1 ) +! expandedStatement.replace(pos, +! foundPos + 1, +! colList); + } + + statement = expandedStatement.toString(); |