summaryrefslogtreecommitdiff
path: root/funcs
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2011-02-28 09:34:16 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2011-02-28 09:34:16 +0000
commit008aa0e3b8bbd962ef9e25feab3c87421c0c3344 (patch)
tree26196efd552aab94421cc28b574d9c4fcbf58f41 /funcs
parentb6e37118c9220f65e9bcb77bf88ccb46796906a2 (diff)
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
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_odbc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index a5f02316f..8ba91da1b 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;