From 6cb6d05456badf00869afde94f94bd3ef174e0ca Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 12 Jun 2000 22:36:19 +0000
Subject: [PATCH] Brand 7.1 release.  Also update jdbc version in release
 branch.

---
 README                                        |  2 +-
 doc/bug.template                              |  2 +-
 doc/src/FAQ.html                              | 20 ++++++++++++++++++-
 register.txt                                  |  2 +-
 src/include/catalog/catversion.h              |  4 ++--
 src/include/version.h.in                      |  4 ++--
 .../postgresql/jdbc1/DatabaseMetaData.java    |  2 +-
 .../postgresql/jdbc2/DatabaseMetaData.java    |  2 +-
 src/interfaces/libpq/libpq.rc                 |  8 ++++----
 9 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/README b/README
index fb6484026ab..7928545f02b 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 PostgreSQL Data Base Management System (formerly known as Postgres, then
 as Postgres95).
   
-This directory contains the development version of 7.0 of the
+This directory contains the development version of 7.1 of the
 PostgreSQL database server.  The server is not ANSI SQL compliant, but
 it gets closer with every release.  After you unzip and untar the
 distribution file, look at file INSTALL for the installation notes and
diff --git a/doc/bug.template b/doc/bug.template
index e279c195533..0474b58b0ec 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration
 
   Operating System (example: Linux 2.0.26 ELF) 	:
 
-  PostgreSQL version (example: PostgreSQL-7.0):   PostgreSQL-7.0.1
+  PostgreSQL version (example: PostgreSQL-7.1):   PostgreSQL-7.1
 
   Compiler used (example:  gcc 2.8.0)		:
 
diff --git a/doc/src/FAQ.html b/doc/src/FAQ.html
index a71b00f90e3..e549bb98a45 100644
--- a/doc/src/FAQ.html
+++ b/doc/src/FAQ.html
@@ -137,7 +137,9 @@ am running? <BR>
 large obj descriptor.</I>  Why?<BR>
 <A HREF="#4.22">4.22</A>) 	How do I create a column that will default to the
 current time?<BR>
-<A HREF="#4.23">4.23</A>) 	Why are my subqueries using <CODE>IN</CODE> so slow?<BR>
+<A HREF="#4.23">4.23</A>) Why are my subqueries using <CODE>IN</CODE> so
+slow?<BR>
+<A HREF="#4.24">4.24</A>) How do I do an <i>outer</i> join?<BR>
 
 <H2><CENTER>Extending PostgreSQL</CENTER></H2>
 
@@ -1206,6 +1208,22 @@ to:
 </PRE></CODE>
 We hope to fix this limitation in a future release.
 
+<H4><A NAME="4.24">4.24</A>) How do I do an <i>outer</i> join?<BR></H4><P>
+PostgreSQL does not support outer joins in the current release. They can
+be simulated using <small>UNION</small> and <small>NOT IN</small>. For
+example, when joining <i>tab1</i> and <i>tab2,</i> the following query
+does an <i>outer</i> join of the two tables:
+<PRE>
+	SELECT tab1.col1, tab2.col2
+	FROM tab1, tab2
+	WHERE tab1.col1 = tab2.col1
+	UNION ALL
+	SELECT tab1.col1, NULL
+	FROM tab1
+	WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)
+	ORDER BY tab1.col1
+</PRE>
+
 <HR>
 
 <H2><CENTER>Extending PostgreSQL</CENTER></H2><P>
diff --git a/register.txt b/register.txt
index 1d6f1bb6eed..83cbbd9a5d6 100644
--- a/register.txt
+++ b/register.txt
@@ -1,5 +1,5 @@
 
-(2000-06-01)
+(2000-09-01)
 PostgreSQL has a Web site at http://www.postgresql.org/ which carries details
 on the latest release, upcoming features, and other information to make your
 work or play with PostgreSQL more productive.
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 04e69766368..f15a07fe2b0 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catversion.h,v 1.29 2000/06/12 03:40:51 momjian Exp $
+ * $Id: catversion.h,v 1.30 2000/06/12 22:36:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200006081
+#define CATALOG_VERSION_NO	200006121
 
 #endif
diff --git a/src/include/version.h.in b/src/include/version.h.in
index 3c11c6fffa7..cf291a5734c 100644
--- a/src/include/version.h.in
+++ b/src/include/version.h.in
@@ -4,7 +4,7 @@
  *	  this file contains the interface to version.c.
  *	  Also some parameters.
  *
- * $Header: /cvsroot/pgsql/src/include/Attic/version.h.in,v 1.8 1999/11/01 02:33:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/Attic/version.h.in,v 1.9 2000/06/12 22:36:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@ void ValidatePgVersion(const char *path, char **reason_p);
 void SetPgVersion(const char *path, char **reason_p);
 
 #define PG_RELEASE		"7"
-#define PG_VERSION		"0"
+#define PG_VERSION		"1"
 #define PG_SUBVERSION		"0"
 
 #define PG_VERFILE		"PG_VERSION"
diff --git a/src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java
index eae5ac6b514..4ab6a0c02d9 100644
--- a/src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java
@@ -179,7 +179,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    */
   public String getDatabaseProductVersion() throws SQLException
   {
-    return ("6.5.2");
+    return ("7.1");
   }
   
   /**
diff --git a/src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java
index 9a16640d59a..b4b7ebc677f 100644
--- a/src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java
@@ -179,7 +179,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    */
   public String getDatabaseProductVersion() throws SQLException
   {
-    return ("6.5.2");
+    return ("7.1");
   }
   
   /**
diff --git a/src/interfaces/libpq/libpq.rc b/src/interfaces/libpq/libpq.rc
index 5a6ada372ad..ca35098d55f 100644
--- a/src/interfaces/libpq/libpq.rc
+++ b/src/interfaces/libpq/libpq.rc
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,0,0,0
- PRODUCTVERSION 7,0,0,0
+ FILEVERSION 7,1,0,0
+ PRODUCTVERSION 7,1,0,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "7, 0, 0, 0\0"
+            VALUE "FileVersion", "7, 1, 0, 0\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2000\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "7, 0, 0, 0\0"
+            VALUE "ProductVersion", "7, 1, 0, 0\0"
         END
     END
     BLOCK "VarFileInfo"
-- 
GitLab