aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBarry Lind <barry@xythos.com>2003-02-12 06:13:04 +0000
committerBarry Lind <barry@xythos.com>2003-02-12 06:13:04 +0000
commit0dbb7aeac4235c8d3a026adbe8585e2cbdf2771e (patch)
tree24b4381735c929cafed4af71fed89dbd040df266 /src
parentd6b043eb6387f7497b90d8c1914c846066ca45c7 (diff)
downloadpostgresql-0dbb7aeac4235c8d3a026adbe8585e2cbdf2771e.tar.gz
postgresql-0dbb7aeac4235c8d3a026adbe8585e2cbdf2771e.zip
Patch to messages file from Holger Klawitter to add a missing message.
Patch to makefile to clean up some of the output Modified Files: jdbc/Makefile jdbc/org/postgresql/errors.properties jdbc/org/postgresql/errors_de.properties
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/jdbc/Makefile14
-rw-r--r--src/interfaces/jdbc/org/postgresql/errors.properties1
-rw-r--r--src/interfaces/jdbc/org/postgresql/errors_de.properties3
3 files changed, 10 insertions, 8 deletions
diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile
index 3e41fc9eb84..e7c49c3c6d8 100644
--- a/src/interfaces/jdbc/Makefile
+++ b/src/interfaces/jdbc/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 2001, PostgreSQL Global Development Group
#
-# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.37 2002/12/11 12:27:47 davec Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.38 2003/02/12 06:13:04 barry Exp $
#
#-------------------------------------------------------------------------
@@ -16,12 +16,12 @@ majorversion:= $(shell echo $(VERSION) | sed 's/^\([0-9][0-9]*\)\..*$$/\1/')
minorversion:= $(shell echo $(VERSION) | sed 's/^[0-9][0-9]*\.\([0-9][0-9]*\).*$$/\1/')
build.properties: $(top_builddir)/src/Makefile.global
- echo "# This file was created by 'make build.properties'." > build.properties
- echo major=$(majorversion) >> build.properties
- echo minor=$(minorversion) >> build.properties
- echo fullversion=$(VERSION) >> build.properties
- echo def_pgport=$(DEF_PGPORT) >> build.properties
- echo enable_debug=$(enable_debug) >> build.properties
+ @echo "# This file was created by 'make build.properties'." > build.properties
+ @echo major=$(majorversion) >> build.properties
+ @echo minor=$(minorversion) >> build.properties
+ @echo fullversion=$(VERSION) >> build.properties
+ @echo def_pgport=$(DEF_PGPORT) >> build.properties
+ @echo enable_debug=$(enable_debug) >> build.properties
all: build.properties
$(ANT) -buildfile $(srcdir)/build.xml all
diff --git a/src/interfaces/jdbc/org/postgresql/errors.properties b/src/interfaces/jdbc/org/postgresql/errors.properties
index ca649b06c26..589baf704bf 100644
--- a/src/interfaces/jdbc/org/postgresql/errors.properties
+++ b/src/interfaces/jdbc/org/postgresql/errors.properties
@@ -70,6 +70,7 @@ postgresql.serial.underscore:Class names may not have _ in them. You supplied {0
postgresql.stat.batch.error:Batch entry {0} {1} was aborted.
postgresql.stat.maxfieldsize:An attempt to setMaxFieldSize() failed - compile time default in force.
postgresql.stat.noresult:No results were returned by the query.
+postgresql.stat.result:A result was returned when none was expected.
postgresql.stream.eof:The backend has broken the connection. Possibly the action you have attempted has caused it to close.
postgresql.stream.flush:An I/O error has occured while flushing the output - {0}
postgresql.stream.ioerror:An I/O error occured while reading from backend - {0}
diff --git a/src/interfaces/jdbc/org/postgresql/errors_de.properties b/src/interfaces/jdbc/org/postgresql/errors_de.properties
index 0146bde928d..ed641e985a7 100644
--- a/src/interfaces/jdbc/org/postgresql/errors_de.properties
+++ b/src/interfaces/jdbc/org/postgresql/errors_de.properties
@@ -1,7 +1,7 @@
# Message translation file for PostgreSQL JDBC driver
# Peter Eisentraut <peter_e@gmx.net>, 2001.
#
-# $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Attic/errors_de.properties,v 1.3 2002/04/02 06:24:09 barry Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Attic/errors_de.properties,v 1.4 2003/02/12 06:13:04 barry Exp $
postgresql.con.auth:Der Authentifizierungstyp »{0}« wird nicht unterstützt.
postgresql.con.authfail:Ein Fehler trat auf während die Authentifizierungsanfrage empfangen wurde.
@@ -68,6 +68,7 @@ postgresql.serial.underscore:Zu serialisierende Klassennamen dürfen keine Unters
postgresql.stat.batch.error:Batch-Anweisung Nummer {0} ({1}) wurde abgebrochen.
postgresql.stat.maxfieldsize:setMaxFieldSize() is nicht möglich; die Grenze ist fest eingebaut.
postgresql.stat.noresult:Die Abfrage ergab kein Ergebnis.
+postgresql.stat.result:Die Anweisung ergab einen Abfrageergebnissatz, obwohl keiner erwartet wurde.
postgresql.stream.encoding:Nicht unterstützte Kodierung: {0}
postgresql.stream.eof:Unerwarteter Verbindungsabbruch vom Server
postgresql.stream.flush:Eingabe/Ausgabe-Fehler beim Flush zum Server: {0}