Merged revisions 59302 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r59302 | tilghman | 2007-03-29 11:07:05 -0500 (Thu, 29 Mar 2007) | 11 lines

Merged revisions 59301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r59301 | tilghman | 2007-03-29 11:04:46 -0500 (Thu, 29 Mar 2007) | 3 lines

Issue 9415 - No point to getting a diagnostic field if we aren't doing anything with the information.
(Plus, it tends to crash the Postgres ODBC driver.)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59303 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 79ea145..6738aa6 100644 (file)
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -378,17 +378,13 @@ out:
 
 static int odbc_do_query(void)
 {
-       SQLINTEGER ODBC_err;
        int ODBC_res;
-       short int ODBC_mlen;
-       char ODBC_msg[200], ODBC_stat[10];
        
        ODBC_res = SQLExecute(ODBC_stmt);
        
        if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
                if (option_verbose > 10)
                        ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error in Query %d\n", ODBC_res);
-               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
                SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
                odbc_disconnect();
                return -1;