diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-03-06 06:10:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-03-06 06:10:59 +0000 |
| commit | 92288a1cf9490be3835dc8524ee2ba407f1b885a (patch) | |
| tree | c4fe79ee2cb5cb8fa3385580c6cf431a97c2fc48 /src/interfaces/odbc | |
| parent | 22ebad9e39e268c9d4c6c2e422af727058830089 (diff) | |
| download | postgresql-92288a1cf9490be3835dc8524ee2ba407f1b885a.tar.gz postgresql-92288a1cf9490be3835dc8524ee2ba407f1b885a.zip | |
Change made to elog:
o Change all current CVS messages of NOTICE to WARNING. We were going
to do this just before 7.3 beta but it has to be done now, as you will
see below.
o Change current INFO messages that should be controlled by
client_min_messages to NOTICE.
o Force remaining INFO messages, like from EXPLAIN, VACUUM VERBOSE, etc.
to always go to the client.
o Remove INFO from the client_min_messages options and add NOTICE.
Seems we do need three non-ERROR elog levels to handle the various
behaviors we need for these messages.
Regression passed.
Diffstat (limited to 'src/interfaces/odbc')
| -rw-r--r-- | src/interfaces/odbc/connection.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c index 389da5698ae..3d07474a560 100644 --- a/src/interfaces/odbc/connection.c +++ b/src/interfaces/odbc/connection.c @@ -578,12 +578,12 @@ md5_auth_send(ConnectionClass *self, const char *salt) { free(pwd1); return 1; - } + } if (!(pwd2 = malloc(MD5_PASSWD_LEN + 1))) { free(pwd1); return 1; - } + } if (!EncryptMD5(pwd1 + strlen("md5"), salt, 4, pwd2)) { free(pwd2); @@ -595,7 +595,7 @@ md5_auth_send(ConnectionClass *self, const char *salt) SOCK_put_n_char(sock, pwd2, strlen(pwd2) + 1); SOCK_flush_output(sock); free(pwd2); - return 0; + return 0; } char @@ -1199,7 +1199,7 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi) { mylog("send_query: ok - 'C' - %s\n", cmdbuffer); - if (res == NULL) /* allow for "show" style notices */ + if (res == NULL) /* allow for "show" style info */ res = QR_Constructor(); mylog("send_query: setting cmdbuffer = '%s'\n", cmdbuffer); @@ -1243,7 +1243,7 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi) ReadyToReturn = FALSE; } break; - case 'N': /* NOTICE: */ + case 'N': /* INFO, NOTICE, WARNING */ msg_truncated = SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH); if (!res) res = QR_Constructor(); @@ -1257,19 +1257,19 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi) strcpy(PG_CCSS, cmdbuffer + 36);
if (strstr(cmdbuffer,"Current server encoding is"))
strcpy(PG_SCSS, cmdbuffer + 36);
- mylog("~~~ NOTICE: '%s'\n", cmdbuffer);
- qlog("NOTICE from backend during send_query: '%s'\n ClientEncoding = %s\n ServerEncoding = %s\n", cmdbuffer, PG_CCSS, PG_SCSS);
+ mylog("~~~ WARNING: '%s'\n", cmdbuffer);
+ qlog("WARNING from backend during send_query: '%s'\n ClientEncoding = %s\n ServerEncoding = %s\n", cmdbuffer, PG_CCSS, PG_SCSS);
}
else
{
- mylog("~~~ NOTICE: '%s'\n", cmdbuffer);
- qlog("NOTICE from backend during send_query: '%s'\n", cmdbuffer);
+ mylog("~~~ WARNING: '%s'\n", cmdbuffer);
+ qlog("WARNING from backend during send_query: '%s'\n", cmdbuffer);
}
#else
- mylog("~~~ NOTICE: '%s'\n", cmdbuffer);
- qlog("NOTICE from backend during send_query: '%s'\n", cmdbuffer);
+ mylog("~~~ WARNING: '%s'\n", cmdbuffer);
+ qlog("WARNING from backend during send_query: '%s'\n", cmdbuffer);
#endif while (msg_truncated) msg_truncated = SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH); @@ -1591,7 +1591,7 @@ CC_send_function(ConnectionClass *self, int fnid, void *result_buf, int *actual_ SOCK_get_string(sock, msgbuffer, ERROR_MSG_LENGTH); mylog("send_function(G): 'N' - %s\n", msgbuffer); - qlog("NOTICE from backend during send_function: '%s'\n", msgbuffer); + qlog("WARNING from backend during send_function: '%s'\n", msgbuffer); continue; /* dont return a result -- continue * reading */ |