NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitd66a44a

committed

Reversed out libpq protocol patch for Tom Lane.

1 parent8930699 commitd66a44aCopy full SHA for d66a44a

File tree

2 files changed

-26

lines changed

src/interfaces
- ecpg/preproc
  - preproc.c
- libpq
  - fe-exec.c

2 files changed

-26

lines changed

`‎src/interfaces/ecpg/preproc/preproc.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11220,7 +11220,7 @@ case 468:`
`11220`	`11220`	`case 469:`
`11221`	`11221`	`#line 2621 "preproc.y"`
`11222`	`11222`	`{`
`11223`		`-yyval.str = yyvsp[0].str`
	`11223`	`+yyval.str = yyvsp[0].str;`
`11224`	`11224`	`;`
`11225`	`11225`	`break;}`
`11226`	`11226`	`case 470:`

`‎src/interfaces/libpq/fe-exec.c`

Lines changed: 4 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.76 1999/03/1416:46:21 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.77 1999/03/1418:12:21 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -467,7 +467,6 @@ static void`
`467`	`467`	`parseInput(PGconn*conn)`
`468`	`468`	`{`
`469`	`469`	`charid;`
`470`		`-staticintpendingT=0;`
`471`	`470`
`472`	`471`	`/*`
`473`	`472`	`* Loop to parse successive complete messages available in the buffer.`
`@@ -536,16 +535,7 @@ parseInput(PGconn *conn)`
`536`	`535`	`PGRES_COMMAND_OK);`
`537`	`536`	`if (pqGets(conn->result->cmdStatus,CMDSTATUS_LEN,conn))`
`538`	`537`	`return;`
`539`		`-if (pendingT) {`
`540`		`-/* Check the returned message */`
`541`		`-/* if it's a SELECT or FETCH in a pendingT case, */`
`542`		`-/* then it probably means no rows returned. */`
`543`		`-/* We clear pendingT in that case. */`
`544`		`-if ((strncmp(conn->result->cmdStatus,"SELECT",6)==0)\|\|`
`545`		`- (strncmp(conn->result->cmdStatus,"FETCH",5)==0))`
`546`		`-pendingT=0;`
`547`		`- }`
`548`		`-if (!pendingT)conn->asyncStatus=PGASYNC_READY;`
	`538`	`+conn->asyncStatus=PGASYNC_READY;`
`549`	`539`	`break;`
`550`	`540`	`case'E':/* error return */`
`551`	`541`	`if (pqGets(conn->errorMessage,ERROR_MSG_LENGTH,conn))`
`@@ -555,11 +545,10 @@ parseInput(PGconn *conn)`
`555`	`545`	`/* and build an error result holding the error message */`
`556`	`546`	`conn->result=PQmakeEmptyPGresult(conn,`
`557`	`547`	`PGRES_FATAL_ERROR);`
`558`		`-if (!pendingT)conn->asyncStatus=PGASYNC_READY;`
	`548`	`+conn->asyncStatus=PGASYNC_READY;`
`559`	`549`	`break;`
`560`	`550`	`case'Z':/* backend is ready for new query */`
`561`	`551`	`conn->asyncStatus=PGASYNC_IDLE;`
`562`		`-pendingT=0;`
`563`	`552`	`break;`
`564`	`553`	`case'I':/* empty query */`
`565`	`554`	`/* read and throw away the closing '\0' */`
`@@ -574,7 +563,7 @@ parseInput(PGconn *conn)`
`574`	`563`	`if (conn->result==NULL)`
`575`	`564`	`conn->result=PQmakeEmptyPGresult(conn,`
`576`	`565`	`PGRES_EMPTY_QUERY);`
`577`		`-if (!pendingT)conn->asyncStatus=PGASYNC_READY;`
	`566`	`+conn->asyncStatus=PGASYNC_READY;`
`578`	`567`	`break;`
`579`	`568`	`case'K':/* secret key data from the backend */`
`580`	`569`
`@@ -595,15 +584,11 @@ parseInput(PGconn *conn)`
`595`	`584`	`break;`
`596`	`585`	`case'T':/* row descriptions (start of query`
`597`	`586`	`* results) */`
`598`		`-if (pendingT) {`
`599`		`-DONOTICE(conn,"Got second 'T' message!\n");`
`600`		`- }`
`601`	`587`	`if (conn->result==NULL)`
`602`	`588`	`{`
`603`	`589`	`/* First 'T' in a query sequence */`
`604`	`590`	`if (getRowDescriptions(conn))`
`605`	`591`	`return;`
`606`		`-pendingT=1;`
`607`	`592`	`}`
`608`	`593`	`else`
`609`	`594`	`{`
`@@ -615,13 +600,11 @@ parseInput(PGconn *conn)`
`615`	`600`	`* We stop parsing until the application accepts`
`616`	`601`	`* the current result.`
`617`	`602`	`*/`
`618`		`-pendingT=0;`
`619`	`603`	`conn->asyncStatus=PGASYNC_READY;`
`620`	`604`	`return;`
`621`	`605`	`}`
`622`	`606`	`break;`
`623`	`607`	`case'D':/* ASCII data tuple */`
`624`		`-pendingT=0;`
`625`	`608`	`if (conn->result!=NULL)`
`626`	`609`	`{`
`627`	`610`	`/* Read another tuple of a normal query response */`
`@@ -639,7 +622,6 @@ parseInput(PGconn *conn)`
`639`	`622`	`}`
`640`	`623`	`break;`
`641`	`624`	`case'B':/* Binary data tuple */`
`642`		`-pendingT=0;`
`643`	`625`	`if (conn->result!=NULL)`
`644`	`626`	`{`
`645`	`627`	`/* Read another tuple of a normal query response */`
`@@ -657,15 +639,12 @@ parseInput(PGconn *conn)`
`657`	`639`	`}`
`658`	`640`	`break;`
`659`	`641`	`case'G':/* Start Copy In */`
`660`		`-pendingT=0;`
`661`	`642`	`conn->asyncStatus=PGASYNC_COPY_IN;`
`662`	`643`	`break;`
`663`	`644`	`case'H':/* Start Copy Out */`
`664`		`-pendingT=0;`
`665`	`645`	`conn->asyncStatus=PGASYNC_COPY_OUT;`
`666`	`646`	`break;`
`667`	`647`	`default:`
`668`		`-pendingT=0;`
`669`	`648`	`sprintf(conn->errorMessage,`
`670`	`649`	`"unknown protocol character '%c' read from backend. "`
`671`	`650`	`"(The protocol character is the first character the "`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd66a44a

File tree

2 files changed

2 files changed

`‎src/interfaces/ecpg/preproc/preproc.c`

`‎src/interfaces/libpq/fe-exec.c`

0 commit comments