Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 075a007

Browse files
committed
I think we're done with protocol instability, so mark server and libpq
as speaking the one true 3.0 protocol.
1 parent c0a8c3a commit 075a007

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

src/backend/postmaster/postmaster.c

+1-11
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* 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 $
4141
*
4242
* NOTES
4343
*
@@ -1217,16 +1217,6 @@ ProcessStartupPacket(Port *port, bool SSLdone)
12171217
*/
12181218
FrontendProtocol = proto;
12191219

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-
12301220
/* Check we can handle the protocol the frontend is using. */
12311221

12321222
if (PG_PROTOCOL_MAJOR(proto) < PG_PROTOCOL_MAJOR(PG_PROTOCOL_EARLIEST) ||

src/include/libpq/pqcomm.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
1010
* Portions Copyright (c) 1994, Regents of the University of California
1111
*
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 $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -106,7 +106,7 @@ typedef union SockAddr
106106
/* The earliest and latest frontend/backend protocol version supported. */
107107

108108
#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)
110110

111111
typedef uint32 ProtocolVersion; /* FE/BE protocol version number */
112112

src/interfaces/libpq/libpq-int.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
15-
* $Id: libpq-int.h,v 1.69 2003/05/08 18:16:37 tgl Exp $
15+
* $Id: libpq-int.h,v 1.70 2003/05/08 18:33:39 tgl Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -56,7 +56,7 @@ typedef int ssize_t; /* ssize_t doesn't exist in VC (atleast
5656
* pqcomm.h describe what the backend knows, not what libpq knows.
5757
*/
5858

59-
#define PG_PROTOCOL_LIBPQ PG_PROTOCOL(3,108) /* XXX temporary value */
59+
#define PG_PROTOCOL_LIBPQ PG_PROTOCOL(3,0)
6060

6161
/*
6262
* POSTGRES backend dependent Constants.

0 commit comments

Comments
 (0)