diff options
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 11 | ||||
| -rw-r--r-- | hsqldb/patches/i103528.patch | 11 | ||||
| -rw-r--r-- | hsqldb/patches/i104901.patch | 27 | ||||
| -rw-r--r-- | hsqldb/patches/i96823.patch (renamed from hsqldb/patches/accumulated_patches.patch) | 21 | ||||
| -rw-r--r-- | hsqldb/patches/i97032.patch | 10 | ||||
| -rw-r--r-- | hsqldb/patches/index.txt | 17 |
6 files changed, 52 insertions, 45 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 5732f3ae767c..b38dea0d201d 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -56,13 +56,10 @@ CONVERTFILES=build$/build.xml \ src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \ src$/org$/hsqldb$/Library.java -PATCH_FILES=patches$/accumulated_patches.patch - -# ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \ -# src$/org$/hsqldb$/TxManager.java \ -# src$/org$/hsqldb$/lib$/LongKeyIntValueHashMap.java \ -# src$/org$/hsqldb$/persist$/ScaledRAFileInJar.java \ -# src$/org$/hsqldb$/test$/TestCollation.java +PATCH_FILES=patches$/i96823.patch \ + patches$/i97032.patch \ + patches$/i103528.patch \ + patches$/i104901.patch .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= diff --git a/hsqldb/patches/i103528.patch b/hsqldb/patches/i103528.patch new file mode 100644 index 000000000000..3cc7d2f1d80d --- /dev/null +++ b/hsqldb/patches/i103528.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/Library.java ++++ misc/build/hsqldb/src/org/hsqldb/Library.java +@@ -1957,7 +1957,7 @@ + functionMap.put("bitand", bitand); + functionMap.put("bitlength", bitLength); + functionMap.put("bitor", bitor); +- functionMap.put("bitxor", bitor); ++ functionMap.put("bitxor", bitxor); + functionMap.put("character", character); + functionMap.put("concat", concat); + functionMap.put("cot", cot); diff --git a/hsqldb/patches/i104901.patch b/hsqldb/patches/i104901.patch new file mode 100644 index 000000000000..a38773f4ba1e --- /dev/null +++ b/hsqldb/patches/i104901.patch @@ -0,0 +1,27 @@ +--- misc/hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.000000000 +0200 ++++ misc/build/hsqldb/src/org/hsqldb/Table.java 2009-09-11 13:45:42.939231519 +0200 +@@ -149,10 +149,10 @@ + Constraint[] constraintList; // constrainst for the table + HsqlArrayList[] triggerLists; // array of trigger lists + private int[] colTypes; // fredt - types of columns +- private int[] colSizes; // fredt - copy of SIZE values for columns ++ int[] colSizes; // fredt - copy of SIZE values for columns + private int[] colScales; // fredt - copy of SCALE values for columns + private boolean[] colNullable; // fredt - modified copy of isNullable() values +- private Expression[] colDefaults; // fredt - expressions of DEFAULT values ++ Expression[] colDefaults; // fredt - expressions of DEFAULT values + private int[] defaultColumnMap; // fred - holding 0,1,2,3,... + private boolean hasDefaultValues; //fredt - shortcut for above + boolean sqlEnforceSize; // inherited from the database - +--- misc/hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.000000000 +0100 ++++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java 2009-09-11 13:47:50.328667463 +0200 +@@ -670,7 +670,8 @@ + // default expressions can change + oldCol.setType(newCol); + oldCol.setDefaultExpression(newCol.getDefaultExpression()); +- table.setColumnTypeVars(colIndex); ++ table.colSizes[colIndex] = oldCol.getSize(); ++ table.colDefaults[colIndex] = oldCol.getDefaultExpression(); + table.resetDefaultsFlag(); + + return; diff --git a/hsqldb/patches/accumulated_patches.patch b/hsqldb/patches/i96823.patch index f7d341a9996f..9803bc619e47 100644 --- a/hsqldb/patches/accumulated_patches.patch +++ b/hsqldb/patches/i96823.patch @@ -92,24 +92,3 @@ return ""; } ---- 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 ---- misc/hsqldb/src/org/hsqldb/Library.java -+++ misc/build/hsqldb/src/org/hsqldb/Library.java -@@ -1957,7 +1957,7 @@ - functionMap.put("bitand", bitand); - functionMap.put("bitlength", bitLength); - functionMap.put("bitor", bitor); -- functionMap.put("bitxor", bitor); -+ functionMap.put("bitxor", bitxor); - functionMap.put("character", character); - functionMap.put("concat", concat); - functionMap.put("cot", cot); diff --git a/hsqldb/patches/i97032.patch b/hsqldb/patches/i97032.patch new file mode 100644 index 000000000000..9703b89613d4 --- /dev/null +++ b/hsqldb/patches/i97032.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 deleted file mode 100644 index a7a06fc97984..000000000000 --- a/hsqldb/patches/index.txt +++ /dev/null @@ -1,17 +0,0 @@ -==================================================================================== -File name ---------- - patch_file.patch - -Description ------------ - patches HSQL so that .... - -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> - - |