diff options
| author | Michael Meskes <meskes@postgresql.org> | 2006-07-31 10:15:31 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2006-07-31 10:15:31 +0000 |
| commit | c1c9b7c0c055cdd4b9306ced7d90633bd4887abb (patch) | |
| tree | f9f11db90dd6af786b47a6febf90b02adfee83f2 /src/interfaces/ecpg/ecpglib/misc.c | |
| parent | 68dfef040b6f5d2956936ffe8b0d070aabaf7d3f (diff) | |
| download | postgresql-c1c9b7c0c055cdd4b9306ced7d90633bd4887abb.tar.gz postgresql-c1c9b7c0c055cdd4b9306ced7d90633bd4887abb.zip | |
First small patches needed for regression tests
Diffstat (limited to 'src/interfaces/ecpg/ecpglib/misc.c')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/misc.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c index fbe02bac10d..ef46496e753 100644 --- a/src/interfaces/ecpg/ecpglib/misc.c +++ b/src/interfaces/ecpg/ecpglib/misc.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.27 2006/06/21 11:38:07 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.28 2006/07/31 10:15:30 meskes Exp $ */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" @@ -246,7 +246,8 @@ ECPGlog(const char *format,...) if (simple_debug) { - char *f = (char *) malloc(strlen(format) + 100); + int bufsize = strlen(format) + 100; + char *f = (char *) malloc(bufsize); if (f == NULL) { @@ -256,11 +257,24 @@ ECPGlog(const char *format,...) return; } - sprintf(f, "[%d]: %s", (int) getpid(), format); + /* + * regression tests set this environment variable to get the same + * output for every run. + */ + if (getenv("ECPG_DONT_LOG_PID")) + snprintf(f, bufsize, "[NO_PID]: %s", format); + else + snprintf(f, bufsize, "[%d]: %s", (int) getpid(), format); va_start(ap, format); vfprintf(debugstream, f, ap); va_end(ap); + + /* dump out internal sqlca variables */ + if (getenv("ECPG_DONT_LOG_PID")) + fprintf(debugstream, "[NO_PID]: sqlca: code: %ld, state: %s\n", + sqlca.sqlcode, sqlca.sqlstate); + fflush(debugstream); ECPGfree(f); |