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

tglsfdc · tglsfdc · commit 075a0078df45 · 2003-05-08T18:33:39.000Z
as speaking the one true 3.0 protocol.
diff --git 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
@@ -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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.323 2003/05/08 14:49:03 momjian Exp $`
	`40`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.324 2003/05/08 18:33:25 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -1217,16 +1217,6 @@ ProcessStartupPacket(Port *port, bool SSLdone)`
`1217`	`1217`	`*/`
`1218`	`1218`	`FrontendProtocol = proto;`
`1219`	`1219`
`1220`		`- /*`
`1221`		`- * XXX temporary for 3.0 protocol development: we are using the minor`
`1222`		`- * number as a test-version number. Insist it match exactly so people`
`1223`		`- * don't get burnt by using yesterday's libpq with today's server.`
`1224`		`- * XXX this must go away before release!!!`
`1225`		`- */`
`1226`		`- if (PG_PROTOCOL_MAJOR(proto) == 3 &&`
`1227`		`- PG_PROTOCOL_MINOR(proto) != PG_PROTOCOL_MINOR(PG_PROTOCOL_LATEST))`
`1228`		`- elog(FATAL, "Your development libpq is out of sync with the server");`
`1229`		`-`
`1230`	`1220`	`/* Check we can handle the protocol the frontend is using. */`
`1231`	`1221`
`1232`	`1222`	`if (PG_PROTOCOL_MAJOR(proto) < PG_PROTOCOL_MAJOR(PG_PROTOCOL_EARLIEST) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`10`	`10`	`* Portions Copyright (c) 1994, Regents of the University of California`
`11`	`11`	`*`
`12`		`- * $Id: pqcomm.h,v 1.84 2003/05/08 18:16:37 tgl Exp $`
	`12`	`+ * $Id: pqcomm.h,v 1.85 2003/05/08 18:33:32 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -106,7 +106,7 @@ typedef union SockAddr`
`106`	`106`	`/* The earliest and latest frontend/backend protocol version supported. */`
`107`	`107`
`108`	`108`	`#define PG_PROTOCOL_EARLIEST PG_PROTOCOL(1,0)`
`109`		`-#define PG_PROTOCOL_LATEST PG_PROTOCOL(3,108) /* XXX temporary value */`
	`109`	`+#define PG_PROTOCOL_LATEST PG_PROTOCOL(3,0)`
`110`	`110`
`111`	`111`	`typedef uint32 ProtocolVersion; /* FE/BE protocol version number */`
`112`	`112`