diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-12-16 17:40:42 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-12-16 17:40:42 +0100 |
| commit | 18112a3f0c5d004cec507243c412e9d1fcd73096 (patch) | |
| tree | d196364b358ddc5b4bb8194075254720e26c80a2 /storage/connect/odbconn.cpp | |
| parent | e2804d9b74099b9ae2b9f012be881d04dd78a75a (diff) | |
| download | mariadb-git-18112a3f0c5d004cec507243c412e9d1fcd73096.tar.gz | |
- Fix logical error in STRBLK::SetValue
modified:
storage/connect/valblk.cpp
- Fix compiler warning in ODBConn::GetCatInfo
modified:
storage/connect/odbconn.cpp
Diffstat (limited to 'storage/connect/odbconn.cpp')
| -rw-r--r-- | storage/connect/odbconn.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index caf3a18f2ce..04cec2b85c0 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -2135,7 +2135,7 @@ int ODBConn::GetCatInfo(CATPARM *cap) SQLULEN crow; PQRYRES qrp = cap->Qrp; PCOLRES crp; - RETCODE rc; + RETCODE rc = 0; HSTMT hstmt = NULL; SQLLEN *vl, *vlen = NULL; PVAL *pval = NULL; @@ -2199,6 +2199,8 @@ int ODBConn::GetCatInfo(CATPARM *cap) break; case CAT_SPC: ThrowDBX("SQLSpecialColumns not available yet"); + default: + ThrowDBX("Invalid SQL function id"); } // endswitch infotype if (!Check(rc)) |