kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 308991 via svnmerge from

Browse Source 
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
This commit is contained in:
Tilghman Lesher
2011-02-28 09:34:16 +00:00
parent b6e37118c9
commit 008aa0e3b8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
funcs/func_odbc.c
View File

@@ -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;