提交 07a47d92 authored 作者: Thomas Mueller's avatar Thomas Mueller

--no commit message

--no commit message
上级 d9714d21
......@@ -2,5 +2,5 @@
javac=javac
benchmark.drivers.dir=C\:/data/java
path.servlet.jar=C\:/data/classpath/servlet-api.jar
version.name.maven=1.0.20080825
version.name.maven=1.0.57
jdk=1.4
<!--
Copyright 2004-2006 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
Initial Developer: H2 Group
-->
<?
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -38,7 +38,6 @@ import org.h2.constant.SysProperties;
*
* - Documentation: if there are new files, add them to MergeDocs
* - Documentation: check if all javadoc files are in the index
* - run PrepareTranslation (or add to ant docs)
* - ant docs
* - PDF (15 min)
* - footer
......@@ -79,7 +78,7 @@ public class Constants {
public static final int VERSION_JDBC_MINOR = 0;
public static String getVersion() {
return VERSION_MAJOR + "." + VERSION_MINOR+ " (" + BUILD + ")";
return VERSION_MAJOR + "." + VERSION_MINOR + "." + BUILD_ID + " (" + BUILD + ")";
}
public static final int NULL_SORT_LOW = 1, NULL_SORT_HIGH = 2;
......
......@@ -334,17 +334,20 @@ public class Comparison extends Condition {
public Comparison getAdditional(Session session, Comparison other) {
if(compareType == other.compareType && compareType == EQUAL) {
boolean lc = left.isConstant(), rc = right.isConstant();
boolean l2c = other.left.isConstant(), r2c = other.right.isConstant();
String l = left.getSQL();
String l2 = other.left.getSQL();
String r = right.getSQL();
String r2 = other.right.getSQL();
if(l.equals(l2)) {
// must not compare constants. example: NOT(B=2 AND B=3)
if(!(rc && r2c) && l.equals(l2)) {
return new Comparison(session, EQUAL, right, other.right);
} else if(l.equals(r2)) {
} else if(!(rc && l2c) && l.equals(r2)) {
return new Comparison(session, EQUAL, right, other.left);
} else if(r.equals(l2)) {
} else if(!(lc && r2c) && r.equals(l2)) {
return new Comparison(session, EQUAL, left, other.right);
} else if(r.equals(r2)) {
} else if(!(lc && l2c) && r.equals(r2)) {
return new Comparison(session, EQUAL, left, other.left);
}
}
......
......@@ -141,7 +141,7 @@
90118=Kann Tabelle nicht l\u00F6schen {0}
90119=Benutzer-Datentyp {0} besteht bereits
90120=Benutzer-Datentyp {0} nicht gefunden
90121=Datenbank-Aufruf beim Stoppen der VM; URL muss ";DB_CLOSE_ON_EXIT\=FALSE" enthalten um das automatische Schliessen der Datenbank zu verhindern
90121=\#Database is already closed (to disable automatic closing at VM shutdown, add ";DB_CLOSE_ON_EXIT\=FALSE" to the db URL)
90122=Funktion nicht unterst\u00FCtzt f\u00FCr Tabelle {0} wenn Views auf die Tabelle vorhanden sind\: {1}
90123=Kann nicht indizierte und nicht indizierte Parameter mischen
90124=Datei nicht gefunden\: {0}
......
......@@ -141,7 +141,7 @@
90118=Cannot drop table {0}
90119=User data type {0} already exists
90120=User data type {0} not found
90121=Database called at VM shutdown; add ";DB_CLOSE_ON_EXIT\=FALSE" to the db URL to disable automatic database closing
90121=Database is already closed (to disable automatic closing at VM shutdown, add ";DB_CLOSE_ON_EXIT\=FALSE" to the db URL)
90122=Operation not supported for table {0} when there are views on the table\: {1}
90123=Cannot mix indexed and non-indexed parameters
90124=File not found\: {0}
......
......@@ -141,7 +141,7 @@
90118=Nie mozna skasowac tabeli {0}
90119=Typ danych uzytkownika {0} juz istnieje
90120=Typ danych uzytkownika {0} nie istnieje
90121=Database called at VM shutdown; add ";DB_CLOSE_ON_EXIT\=FALSE" to the db URL to disable automatic database closing
90121=\#Database is already closed (to disable automatic closing at VM shutdown, add ";DB_CLOSE_ON_EXIT\=FALSE" to the db URL)
90122=Operacja nie jest dozwolona dla tabeli {0} gdy istnieja widoki oparte na tabeli\: {1}
90123=Nie mozna mieszac parametrow indeksowych z nieindeksowymi
90124=Plik nie istnieje\: {0}
......
......@@ -124,6 +124,8 @@ http://maven.apache.org/guides/mini/guide-central-repository-upload.html
add MVCC
don't create @~ of not translated
improve documentation of 'mixed mode' usage.
test and document fulltext search
......
......@@ -503,4 +503,5 @@ mathematicians instantiation homepage supporter grained tilde subscribe baseline
finalizer textbase newsfeeds quicksort
prio zvikico incrementally nocheck differently eng admins problog nio though typepad channels rolling
lightweight builder
tunes elephant codewave incorrectly mytunesrss speeds cte honoured httpdocs department whereever dog dept edh oops flower music appends research plant
\ No newline at end of file
tunes elephant codewave incorrectly mytunesrss speeds cte honoured httpdocs department whereever dog dept edh oops flower music appends research plant
testview gaps birth vid
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论