diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-04-25 15:34:02 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-04-25 15:34:02 +0200 |
| commit | e9bb12acdb003f3335a547aeec0c3121b282e5b8 (patch) | |
| tree | 0c7d7c589c7997fcc8f9784c3736f62979d9774b /storage/connect/odbconn.cpp | |
| parent | 39750cd4dbe9b79a100d45aae010f39f71ec7ddf (diff) | |
| download | mariadb-git-e9bb12acdb003f3335a547aeec0c3121b282e5b8.tar.gz | |
- Do not throw an error on empty ODBC CATFUNC (MDEV-5455)
modified:
storage/connect/ha_connect.cc
storage/connect/odbconn.cpp
Diffstat (limited to 'storage/connect/odbconn.cpp')
| -rw-r--r-- | storage/connect/odbconn.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index a857a1bc918..d0072987fd0 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -2287,6 +2287,7 @@ int ODBConn::GetCatInfo(CATPARM *cap) } // endfor i +#if 0 if ((crow = i) && (rc == SQL_NO_DATA || rc == SQL_SUCCESS_WITH_INFO)) rc = SQL_SUCCESS; @@ -2303,6 +2304,15 @@ int ODBConn::GetCatInfo(CATPARM *cap) } else ThrowDBX(rc, fnc, hstmt); +#endif // 0 + + if (!rc || rc == SQL_NO_DATA || rc == SQL_SUCCESS_WITH_INFO) { + if ((rc = SQLFetch(hstmt)) != SQL_NO_DATA_FOUND) + qrp->Truncated = true; + + crow = i; + } else + ThrowDBX(rc, fnc, hstmt); irc = (int)crow; } catch(DBX *x) { |