I think we're done with protocol instability, so mark server and libpq

as speaking the one true 3.0 protocol.

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 211fc216f9cb9b35916e9995b13f8a90c72bffc6..5ea0f4705ec35a13873f5e54ebca0e7078ebaab7 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.323 2003/05/08 14:49:03 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.324 2003/05/08 18:33:25 tgl Exp $
  *
  * NOTES
  *
@@ -1217,16 +1217,6 @@ ProcessStartupPacket(Port *port, bool SSLdone)
     */
    FrontendProtocol = proto;
 
-   /*
-    * XXX temporary for 3.0 protocol development: we are using the minor
-    * number as a test-version number.  Insist it match exactly so people
-    * don't get burnt by using yesterday's libpq with today's server.
-    * XXX this must go away before release!!!
-    */
-   if (PG_PROTOCOL_MAJOR(proto) == 3 &&
-       PG_PROTOCOL_MINOR(proto) != PG_PROTOCOL_MINOR(PG_PROTOCOL_LATEST))
-       elog(FATAL, "Your development libpq is out of sync with the server");
-
    /* Check we can handle the protocol the frontend is using. */
 
    if (PG_PROTOCOL_MAJOR(proto) < PG_PROTOCOL_MAJOR(PG_PROTOCOL_EARLIEST) ||

diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index e23b4563edba90e25f9b6ff0ca500e43e2efa892..eac9867391b3e7d4391c876c378da322dc0ad09c 100644 (file)
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.84 2003/05/08 18:16:37 tgl Exp $
+ * $Id: pqcomm.h,v 1.85 2003/05/08 18:33:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -106,7 +106,7 @@ typedef union SockAddr
 /* The earliest and latest frontend/backend protocol version supported. */
 
 #define PG_PROTOCOL_EARLIEST   PG_PROTOCOL(1,0)
-#define PG_PROTOCOL_LATEST     PG_PROTOCOL(3,108) /* XXX temporary value */
+#define PG_PROTOCOL_LATEST     PG_PROTOCOL(3,0)
 
 typedef uint32 ProtocolVersion; /* FE/BE protocol version number */
 

diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index b65f47efbf7d8e9f7efe5ceecaac7b96814a78a3..ad2e0e83c9f5d6a641f4ef3cb3a3344d8aa26f09 100644 (file)
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-int.h,v 1.69 2003/05/08 18:16:37 tgl Exp $
+ * $Id: libpq-int.h,v 1.70 2003/05/08 18:33:39 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,7 +56,7 @@ typedef int ssize_t;          /* ssize_t doesn't exist in VC (atleast
  * pqcomm.h describe what the backend knows, not what libpq knows.
  */
 
-#define PG_PROTOCOL_LIBPQ  PG_PROTOCOL(3,108) /* XXX temporary value */
+#define PG_PROTOCOL_LIBPQ  PG_PROTOCOL(3,0)
 
 /*
  * POSTGRES backend dependent Constants.