NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite05c5a9

Michael Meskes

committed

Applied patch by ITAGAKI Takahiro <itagaki.takahiro@oss.ntt.co.jp> to

fix segfault on non-glibc systems.

1 parentdcf8409 commite05c5a9Copy full SHA for e05c5a9

File tree

3 files changed

+36

-47

lines changed

src/interfaces/ecpg
- ChangeLog
- ecpglib
  - connect.c
- test/expected
  - connect-test1-minGW32.stderr

3 files changed

+36

-47

lines changed

`‎src/interfaces/ecpg/ChangeLog`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2400,6 +2400,11 @@ Wed, 26 Nov 2008 14:09:08 +0100`
`2400`	`2400`	`Mon, 15 Dec 2008 16:31:31 +0100`
`2401`	`2401`
`2402`	`2402`	`- Do not try to change a const variable in ecpg_log.`
	`2403`	`+`
	`2404`	`+Wed, 17 Dec 2008 17:49:11 +0100`
	`2405`	`+`
	`2406`	`+- Applied patch by ITAGAKI Takahiro <itagaki.takahiro@oss.ntt.co.jp> to`
	`2407`	`+ fix segfault on non-glibc systems.`
`2403`	`2408`	`- Set pgtypes library version to 3.1.`
`2404`	`2409`	`- Set compat library version to 3.1.`
`2405`	`2410`	`- Set ecpg library version to 6.2.`

`‎src/interfaces/ecpg/ecpglib/connect.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.51 2008/05/16 15:20:03 petere Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.52 2008/12/17 16:52:07 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#definePOSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include"postgres_fe.h"`
`@@ -144,7 +144,7 @@ ecpg_finish(struct connection * act)`
`144`	`144`	`if (actual_connection==act)`
`145`	`145`	`actual_connection=all_connections;`
`146`	`146`
`147`		`-ecpg_log("ecpg_finish: connection %s closed\n",act->name);`
	`147`	`+ecpg_log("ecpg_finish: connection %s closed\n",act->name ?act->name :"(null)");`
`148`	`148`
`149`	`149`	`for (cache=act->cache_head;cache;ptr=cache,cache=cache->next,ecpg_free(ptr));`
`150`	`150`	`ecpg_free(act->name);`

`‎src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr`

Lines changed: 29 additions & 45 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,80 +1,64 @@`
`1`	`1`	`[NO_PID]: ECPGdebug: set to 1`
`2`	`2`	`[NO_PID]: sqlca: code: 0, state: 00000`
`3`		`-[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>`
	`3`	`+[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>`
`4`	`4`	`[NO_PID]: sqlca: code: 0, state: 00000`
`5`		`-[NO_PID]:ECPGexecuteline 23:QUERY: alter user connectuser encrypted password 'connectpw' on connection main`
	`5`	`+[NO_PID]:ecpg_execute online 23:query: alter user connectuserencrypted password 'connectpw'; with 0 parameter(s) on connection main`
`6`	`6`	`[NO_PID]: sqlca: code: 0, state: 00000`
`7`		`-[NO_PID]:ECPGexecuteline 23 Ok: ALTER ROLE`
	`7`	`+[NO_PID]:ecpg_execute online 23: using PQexec`
`8`	`8`	`[NO_PID]: sqlca: code: 0, state: 00000`
`9`		`-[NO_PID]:ecpg_finish: Connection main closed.`
	`9`	`+[NO_PID]:ecpg_execute on line 23: OK: ALTER ROLE`
`10`	`10`	`[NO_PID]: sqlca: code: 0, state: 00000`
`11`		`-[NO_PID]:ECPGconnect: opening database connectdb on localhost port <DEFAULT>`
	`11`	`+[NO_PID]:ecpg_finish: connection main closed`
`12`	`12`	`[NO_PID]: sqlca: code: 0, state: 00000`
`13`		`-[NO_PID]:ecpg_finish: Connection main closed.`
	`13`	`+[NO_PID]:ECPGconnect: opening database connectdb on localhost port <DEFAULT>`
`14`	`14`	`[NO_PID]: sqlca: code: 0, state: 00000`
`15`		`-[NO_PID]:ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb`
	`15`	`+[NO_PID]:ecpg_finish: connection main closed`
`16`	`16`	`[NO_PID]: sqlca: code: 0, state: 00000`
`17`		`-[NO_PID]:ecpg_finish: Connection main closed.`
	`17`	`+[NO_PID]:ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb`
`18`	`18`	`[NO_PID]: sqlca: code: 0, state: 00000`
`19`		`-[NO_PID]:ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT>`
	`19`	`+[NO_PID]:ecpg_finish: connection main closed`
`20`	`20`	`[NO_PID]: sqlca: code: 0, state: 00000`
`21`		`-[NO_PID]:ecpg_finish: Connection main closed.`
	`21`	`+[NO_PID]:ECPGconnect: opening database connectdb on localhost port <DEFAULT> for user connectuser`
`22`	`22`	`[NO_PID]: sqlca: code: 0, state: 00000`
`23`		`-[NO_PID]:ECPGconnect: opening database <DEFAULT> on localhost port <REGRESSION_PORT> for userconnectdb`
	`23`	`+[NO_PID]:ecpg_finish: connectionconnectdb closed`
`24`	`24`	`[NO_PID]: sqlca: code: 0, state: 00000`
`25`		`-[NO_PID]:ecpg_finish: Connection main closed.`
	`25`	`+[NO_PID]:ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb`
`26`	`26`	`[NO_PID]: sqlca: code: 0, state: 00000`
`27`		`-[NO_PID]:ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT>`
	`27`	`+[NO_PID]:ecpg_finish: connection (null) closed`
`28`	`28`	`[NO_PID]: sqlca: code: 0, state: 00000`
`29`		`-[NO_PID]:ecpg_finish: Connection main closed.`
	`29`	`+[NO_PID]:ECPGconnect: opening database connectdb on localhost port <DEFAULT> for user connectuser`
`30`	`30`	`[NO_PID]: sqlca: code: 0, state: 00000`
`31`		`-[NO_PID]:ECPGconnect: opening database <DEFAULT> on <DEFAULT> port <REGRESSION_PORT> for userconnectdb`
	`31`	`+[NO_PID]:ecpg_finish: connectionconnectdb closed`
`32`	`32`	`[NO_PID]: sqlca: code: 0, state: 00000`
`33`		`-[NO_PID]:ecpg_finish: Connection main closed.`
	`33`	`+[NO_PID]:ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT> for user connectuser`
`34`	`34`	`[NO_PID]: sqlca: code: 0, state: 00000`
`35`		`-[NO_PID]:ECPGconnect: opening databaseconnectdbon localhost port <REGRESSION_PORT> for user connectuser`
	`35`	`+[NO_PID]:ecpg_finish: connectionconnectdbclosed`
`36`	`36`	`[NO_PID]: sqlca: code: 0, state: 00000`
`37`		`-[NO_PID]:ecpg_finish: Connectionconnectdbclosed.`
	`37`	`+[NO_PID]:ECPGconnect: opening databaseconnectdbon <DEFAULT> port <DEFAULT> with options connect_timeout=14 for user connectuser`
`38`	`38`	`[NO_PID]: sqlca: code: 0, state: 00000`
`39`		`-[NO_PID]:ECPGconnect: opening database on localhost port <REGRESSION_PORT> for userconnectdb`
	`39`	`+[NO_PID]:ecpg_finish: connectionconnectdb closed`
`40`	`40`	`[NO_PID]: sqlca: code: 0, state: 00000`
`41`		`-[NO_PID]:ecpg_finish: Connection closed.`
	`41`	`+[NO_PID]:ECPGconnect: opening database nonexistant on localhost port <DEFAULT> for user connectuser`
`42`	`42`	`[NO_PID]: sqlca: code: 0, state: 00000`
`43`		`-[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser`
`44`		`-[NO_PID]: sqlca: code: 0, state: 00000`
`45`		`-[NO_PID]: ecpg_finish: Connection connectdb closed.`
`46`		`-[NO_PID]: sqlca: code: 0, state: 00000`
`47`		`-[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser`
`48`		`-[NO_PID]: sqlca: code: 0, state: 00000`
`49`		`-[NO_PID]: ecpg_finish: Connection connectdb closed.`
`50`		`-[NO_PID]: sqlca: code: 0, state: 00000`
`51`		`-[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser`
`52`		`-[NO_PID]: sqlca: code: 0, state: 00000`
`53`		`-[NO_PID]: ecpg_finish: Connection connectdb closed.`
`54`		`-[NO_PID]: sqlca: code: 0, state: 00000`
`55`		`-[NO_PID]: ECPGconnect: opening database nonexistant on localhost port <REGRESSION_PORT> for user connectuser`
`56`		`-[NO_PID]: sqlca: code: 0, state: 00000`
`57`		`-[NO_PID]: connect: could not open database nonexistant on localhost port <REGRESSION_PORT> for user connectuser in line 62`
`58`		`-FATAL: database "nonexistant" does not exist`
	`43`	`+[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistant" does not exist`
`59`	`44`
`60`	`45`	`[NO_PID]: sqlca: code: 0, state: 00000`
`61`		`-[NO_PID]: ecpg_finish:Connection nonexistant closed.`
	`46`	`+[NO_PID]: ecpg_finish:connection nonexistant closed`
`62`	`47`	`[NO_PID]: sqlca: code: 0, state: 00000`
`63`		`-[NO_PID]: raising sqlcode -402in line62, 'Could not connect to database nonexistant in line62.'.`
	`48`	`+[NO_PID]: raising sqlcode -402on line53: could not connect to database"nonexistant" on line53`
`64`	`49`	`[NO_PID]: sqlca: code: -402, state: 08001`
`65`		`-[NO_PID]: raising sqlcode -220in line63, 'No such connection CURRENTin line63.'.`
	`50`	`+[NO_PID]: raising sqlcode -220on line54: no such connection CURRENTon line54`
`66`	`51`	`[NO_PID]: sqlca: code: -220, state: 08003`
`67`		`-[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser`
	`52`	`+[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT>for user connectuser`
`68`	`53`	`[NO_PID]: sqlca: code: 0, state: 00000`
`69`		`-[NO_PID]: connect: could not open database connectdb on localhost port <REGRESSION_PORT> for user connectuser in line 66`
`70`		`-could not connect to server: Connection refused (0x0000274D/10061)`
	`54`	`+[NO_PID]: ECPGconnect: could not open database: could not connect to server: Connection refused (0x0000274D/10061)`
`71`	`55`	`Is the server running on host "localhost" and accepting`
`72`	`56`	`TCP/IP connections on port 20?`
`73`	`57`
`74`	`58`	`[NO_PID]: sqlca: code: 0, state: 00000`
`75`		`-[NO_PID]: ecpg_finish:Connection connectdb closed.`
	`59`	`+[NO_PID]: ecpg_finish:connection connectdb closed`
`76`	`60`	`[NO_PID]: sqlca: code: 0, state: 00000`
`77`		`-[NO_PID]: raising sqlcode -402in line66, 'Could not connect to database connectdb in line66.'.`
	`61`	`+[NO_PID]: raising sqlcode -402on line57: could not connect to database"connectdb" on line57`
`78`	`62`	`[NO_PID]: sqlca: code: -402, state: 08001`
`79`		`-[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser`
	`63`	`+[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT> for user connectuser`
`80`	`64`	`[NO_PID]: sqlca: code: 0, state: 00000`

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!

Commite05c5a9

File tree

3 files changed

3 files changed

`‎src/interfaces/ecpg/ChangeLog`

`‎src/interfaces/ecpg/ecpglib/connect.c`

`‎src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr`

0 commit comments