[asterisk-commits] tilghman: trunk r47528 - in /trunk: ./ res/res_odbc.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sun Nov 12 23:48:27 2006
New Revision: 47528

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47528
Log:
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

........

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

Modified:
    trunk/   (props changed)
    trunk/res/res_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_odbc.c?view=diff&rev=47528&r1=47527&r2=47528
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Sun Nov 12 23:48:27 2006
@@ -108,6 +108,7 @@
 
 				ast_log(LOG_WARNING, "SQL Execute error %d! Attempting a reconnect...\n", res);
 				SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+				stmt = NULL;
 
 				obj->up = 0;
 				/*