From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 13 Nov 2006 05:48:27 +0000 (+0000)
Subject: Merged revisions 47526 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4022
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70f6330157966740d2dd699a760d7f20766c954c;p=thirdparty%2Fasterisk.git

Merged revisions 47526 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47526 | tilghman | 2006-11-12 23:46:18 -0600 (Sun, 12 Nov 2006) | 10 lines

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

........
r47525 | tilghman | 2006-11-12 23:45:11 -0600 (Sun, 12 Nov 2006) | 2 lines

If the execute fails a second time, make sure that we don't pass back a stale handle

........

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


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

diff --git a/res/res_odbc.c b/res/res_odbc.c
index 036b021517..e871900901 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -108,6 +108,7 @@ SQLHSTMT ast_odbc_prepare_and_execute(struct odbc_obj *obj, SQLHSTMT (*prepare_c
 
 				ast_log(LOG_WARNING, "SQL Execute error %d! Attempting a reconnect...\n", res);
 				SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+				stmt = NULL;
 
 				obj->up = 0;
 				/*