This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_9_118

'OOO_BUILD_1_9_118'.

1 files changed, 70 insertions, 75 deletions

diff --git a/patches/src680/hsqldb-gcj-access-problems.diff b/patches/src680/hsqldb-gcj-access-problems.diff
index 79de76955..f9218c601 100644
--- a/patches/src680/hsqldb-gcj-access-problems.diff
+++ b/patches/src680/hsqldb-gcj-access-problems.diff
@@ -1,53 +1,18 @@
---- hsqldb/hsqldb_1_8_0.orig	2005-07-19 17:51:35.000000000 +0200
-+++ hsqldb/hsqldb_1_8_0	2005-07-19 20:32:56.000000000 +0200
-@@ -1,26 +1,21381 @@
--*** misc/build/hsqldb/build/build.xml	2005-06-26 19:20:30.000000000 +0200
----- misc/build/hsqldb/build/build.xml.patched	2005-07-16 17:00:34.000000000 +0200
-+--- misc/build/hsqldb/build/build.xml.ark	2005-07-19 20:31:53.000000000 +0200
-++++ misc/build/hsqldb/build/build.xml	2005-07-19 20:32:09.000000000 +0200
-+@@ -16,13 +16,8 @@
-+    <property file='build/build.properties'/>
-+    <property name="hsqldb.version" value="1.8.0"/>
-+ 
-+-   <tstamp>
-+-       <format property="_tmpstamp" pattern="yyyy/MM/dd-hh:mm:ss"
-+-               locale="en"/>
-+-   </tstamp>
-+-
-+-   <property name="build.label" value="private-${_tmpstamp}"/>
-+-   <property name="build.vendor" value="${user.name}"/>
-++   <property name="build.label" value="replace-me"/>
-++   <property name="build.vendor" value="OpenOffice.org"/>
-+    <property name="hsqldb.title" value="HSQLDB"/>
-+    <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
-+    <property name="src" value="${basedir}/src"/>
+Index: hsqldb_1_8_0
+===================================================================
+RCS file: /cvs/external/hsqldb/hsqldb_1_8_0,v
+retrieving revision 1.5
+diff -u -p -r1.5 hsqldb_1_8_0
+--- hsqldb/hsqldb_1_8_0	27 Jun 2005 08:26:33 -0000	1.5
++++ hsqldb/hsqldb_1_8_0	30 Jun 2005 08:02:23 -0000
+@@ -46,3 +46,21396 @@ Files misc/hsqldb/lib/hsqldb.jar and mis
+           }
+   
+           properties.setProperty(HsqlDatabaseProperties.db_version,
 +diff -cr misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java
 +*** misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java	2005-06-30 03:50:39.000000000 -0400
 +--- misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java	2005-06-30 03:53:38.000000000 -0400
- ***************
--*** 16,28 ****
--     <property file='build/build.properties'/>
--     <property name="hsqldb.version" value="1.8.0"/>
--  
--!    <tstamp>
--!        <format property="_tmpstamp" pattern="yyyy/MM/dd-hh:mm:ss"
--!                locale="en"/>
--!    </tstamp>
--! 
--!    <property name="build.label" value="private-${_tmpstamp}"/>
--!    <property name="build.vendor" value="${user.name}"/>
--     <property name="hsqldb.title" value="HSQLDB"/>
--     <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
--     <property name="src" value="${basedir}/src"/>
----- 16,23 ----
--     <property file='build/build.properties'/>
--     <property name="hsqldb.version" value="1.8.0"/>
--  
--!    <property name="build.label" value="replace-me"/>
--!    <property name="build.vendor" value="OpenOffice.org"/>
--     <property name="hsqldb.title" value="HSQLDB"/>
--     <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
--     <property name="src" value="${basedir}/src"/>
++***************
 +*** 83,91 ****
 +   */
 +  abstract class BaseMemoryNode extends Node {
@@ -5961,25 +5926,23 @@
 +              System.out.println("HsqlArrayList init count: " + initCounter);
 +              System.out.println("HsqlArrayList update count: "
 +***************
-+*** 67,76 ****
++*** 67,75 ****
 +          }
 +      }
 +  */
 +!     private static final int   DEFAULT_INITIAL_CAPACITY = 10;
 +!     private static final float DEFAULT_RESIZE_FACTOR    = 2.0f;
 +!     private Object[]           elementData;
-+!     private boolean            minimizeOnClear;
 +  
 +      /** Creates a new instance of HsqlArrayList */
 +      public HsqlArrayList() {
-+--- 67,76 ----
++--- 67,75 ----
 +          }
 +      }
 +  */
 +!     public static final int   DEFAULT_INITIAL_CAPACITY = 10;
 +!     public static final float DEFAULT_RESIZE_FACTOR    = 2.0f;
 +!     public Object[]           elementData;
-+!     public boolean            minimizeOnClear;
 +  
 +      /** Creates a new instance of HsqlArrayList */
 +      public HsqlArrayList() {
@@ -8036,6 +7999,23 @@
 +          int cacheScale = database.getProperties().getIntegerProperty(
 +              HsqlDatabaseProperties.hsqldb_cache_scale, 14, 8, 18);
 +***************
++*** 350,356 ****
++          }
++      }
++  
++!     protected void resetBuffers() {
++          rowOut = new RowOutputBinary();
++          rowIn  = new RowInputBinary();
++      }
++--- 350,356 ----
++          }
++      }
++  
++!     public void resetBuffers() {
++          rowOut = new RowOutputBinary();
++          rowIn  = new RowInputBinary();
++      }
++***************
 +*** 443,449 ****
 +       * Free space is requested from the block manager if it exists.
 +       * Otherwise the file is grown to accommodate it.
@@ -9144,18 +9124,18 @@
 +          // but now this is subject to session autoCommit / or commit
 +***************
 +*** 177,183 ****
-+          initBuffers();
++          resetBuffers();
 +      }
 +  
-+!     protected void initBuffers() {
++!     protected void resetBuffers() {
 +  
 +          if (isQuoted || isAllQuoted) {
 +              rowIn = new RowInputTextQuoted(fs, vs, lvs, isAllQuoted);
 +--- 177,183 ----
-+          initBuffers();
++          resetBuffers();
 +      }
 +  
-+!     public void initBuffers() {
++!     public void resetBuffers() {
 +  
 +          if (isQuoted || isAllQuoted) {
 +              rowIn = new RowInputTextQuoted(fs, vs, lvs, isAllQuoted);
@@ -13395,12 +13375,11 @@
 +      //
 +      int   accessMin;
 +***************
-+*** 109,134 ****
-+      final int         initialCapacity;
-+      int               threshold;
-+      int               maxCapacity;
-+!     protected int     purgePolicy = NO_PURGE;
-+!     protected boolean minimizeOnEmpty;
++*** 109,133 ****
++      float         loadFactor;
++      int           threshold;
++      int           maxCapacity;
++!     protected int purgePolicy = NO_PURGE;
 +  
 +      //
 +      boolean hasZeroKey;
@@ -13422,12 +13401,11 @@
 +                            int valueType,
 +                            boolean hasAccessCount)
 +                            throws IllegalArgumentException {
-+--- 109,134 ----
-+      final int      initialCapacity;
-+      int            threshold;
-+      int            maxCapacity;
-+!     public int     purgePolicy = NO_PURGE;
-+!     public boolean minimizeOnEmpty;
++--- 109,133 ----
++      float         loadFactor;
++      int           threshold;
++      int           maxCapacity;
++!     public int purgePolicy = NO_PURGE;
 +  
 +      //
 +      boolean hasZeroKey;
@@ -15065,6 +15043,23 @@
 +  
 +          String[] saData = {
 +              "INSERT INTO XB VALUES('T850','LEAA','00','P',NULL,'LCN NAME','sa',NOW)",
++***************
++*** 143,149 ****
++          }
++      }    // insertData
++  
++!     private static void printNumberOfCARecords(Connection con)
++      throws SQLException {
++  
++          Statement stmt = con.createStatement();
++--- 143,149 ----
++          }
++      }    // insertData
++  
++!     public static void printNumberOfCARecords(Connection con)
++      throws SQLException {
++  
++          Statement stmt = con.createStatement();
 +diff -cr misc/hsqldb/src/org/hsqldb/test/TestCollation.java misc/build/hsqldb/src/org/hsqldb/test/TestCollation.java
 +*** misc/hsqldb/src/org/hsqldb/test/TestCollation.java	2005-06-30 03:50:39.000000000 -0400
 +--- misc/build/hsqldb/src/org/hsqldb/test/TestCollation.java	2005-06-30 03:53:40.000000000 -0400
@@ -17607,9 +17602,9 @@
 +          "See the forums, mailing lists, and HSQLDB User Guide\n"
 +          + "at http://hsqldb.org.\n\n"
 +          + "Please paste the following version identifier with any\n"
-+          + "problem reports or help requests:  $Revision: 1.57 $";
++          + "problem reports or help requests:  $Revision: 1.55 $";
 +!     private static final String ABOUT_TEXT =
-+          "$Revision: 1.57 $ of DatabaseManagerSwing\n\n"
++          "$Revision: 1.55 $ of DatabaseManagerSwing\n\n"
 +          + "Copyright (c) 1995-2000, The Hypersonic SQL Group.\n"
 +          + "Copyright (c) 2001-2005, The HSQL Development Group.\n"
 +--- 188,201 ----
@@ -17622,9 +17617,9 @@
 +          "See the forums, mailing lists, and HSQLDB User Guide\n"
 +          + "at http://hsqldb.org.\n\n"
 +          + "Please paste the following version identifier with any\n"
-+          + "problem reports or help requests:  $Revision: 1.57-OOo $";
++          + "problem reports or help requests:  $Revision: 1.55 $";
 +!     public static final String ABOUT_TEXT =
-+          "$Revision: 1.57-OOo $ of DatabaseManagerSwing\n\n"
++          "$Revision: 1.55 $ of DatabaseManagerSwing\n\n"
 +          + "Copyright (c) 1995-2000, The Hypersonic SQL Group.\n"
 +          + "Copyright (c) 2001-2005, The HSQL Development Group.\n"
 +***************
@@ -18805,8 +18800,8 @@
 +!     private static String revnum = null;
 +  
 +      static {
-+          revnum = "$Revision: 1.121 $".substring("$Revision: ".length(),
-+                  "$Revision: 1.121 $".length() - 2);
++          revnum = "$Revision: 1.120 $".substring("$Revision: ".length(),
++                  "$Revision: 1.120 $".length() - 2);
 +      }
 +  
 +!     private static String BANNER =
@@ -18827,8 +18822,8 @@
 +!     public static String revnum = null;
 +  
 +      static {
-+          revnum = "$Revision: 1.121-OOo $".substring("$Revision: ".length(),
-+                  "$Revision: 1.121-OOo $".length() - 2);
++          revnum = "$Revision: 1.120 $".substring("$Revision: ".length(),
++                  "$Revision: 1.120 $".length() - 2);
 +      }
 +  
 +!     public static String BANNER =