From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 28 Feb 2011 09:34:16 +0000 (+0000)
Subject: Merged revisions 308991 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1816
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=008aa0e3b8bbd962ef9e25feab3c87421c0c3344;p=thirdparty%2Fasterisk.git

Merged revisions 308991 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r308991 | tilghman | 2011-02-28 03:33:22 -0600 (Mon, 28 Feb 2011) | 14 lines

  Merged revisions 308990 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r308990 | tilghman | 2011-02-28 03:32:22 -0600 (Mon, 28 Feb 2011) | 7 lines

    Statements updating zero rows may return SQL_NO_DATA.  This is fine; it's handled.

    (closes issue #18815)
     Reported by: irroot
     Patches:
           func_odbc.insert_nodata.patch uploaded by irroot (license 52)
  ........
................


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

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index a5f02316f5..8ba91da1b4 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -172,7 +172,7 @@ static SQLHSTMT generic_execute(struct odbc_obj *obj, void *data)
 	}
 
 	res = SQLExecDirect(stmt, (unsigned char *)sql, SQL_NTS);
-	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
+	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO) && (res != SQL_NO_DATA)) {
 		if (res == SQL_ERROR) {
 			int i;
 			SQLINTEGER nativeerror=0, numfields=0;