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: http://svn.digium.com/svn/asterisk/trunk@308992 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
f93033b8ee
commit
7c37f22633
|
@ -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;
|
||||
|
|
Reference in New Issue