Commit 18112a3f authored by Olivier Bertrand's avatar Olivier Bertrand

- Fix logical error in STRBLK::SetValue

modified:
  storage/connect/valblk.cpp

- Fix compiler warning in ODBConn::GetCatInfo

modified:
  storage/connect/odbconn.cpp
parent e2804d9b
...@@ -2135,7 +2135,7 @@ int ODBConn::GetCatInfo(CATPARM *cap) ...@@ -2135,7 +2135,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
SQLULEN crow; SQLULEN crow;
PQRYRES qrp = cap->Qrp; PQRYRES qrp = cap->Qrp;
PCOLRES crp; PCOLRES crp;
RETCODE rc; RETCODE rc = 0;
HSTMT hstmt = NULL; HSTMT hstmt = NULL;
SQLLEN *vl, *vlen = NULL; SQLLEN *vl, *vlen = NULL;
PVAL *pval = NULL; PVAL *pval = NULL;
...@@ -2199,6 +2199,8 @@ int ODBConn::GetCatInfo(CATPARM *cap) ...@@ -2199,6 +2199,8 @@ int ODBConn::GetCatInfo(CATPARM *cap)
break; break;
case CAT_SPC: case CAT_SPC:
ThrowDBX("SQLSpecialColumns not available yet"); ThrowDBX("SQLSpecialColumns not available yet");
default:
ThrowDBX("Invalid SQL function id");
} // endswitch infotype } // endswitch infotype
if (!Check(rc)) if (!Check(rc))
......
...@@ -1052,7 +1052,7 @@ void STRBLK::SetValue(char *sp, uint len, int n) ...@@ -1052,7 +1052,7 @@ void STRBLK::SetValue(char *sp, uint len, int n)
memcpy(p, sp, len); memcpy(p, sp, len);
p[len] = 0; p[len] = 0;
} else } else
Strp[n] = Strp[n-1]; p = Strp[n-1];
} else } else
p = NULL; p = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment