Commit 02fa3b8e authored by Olivier Bertrand's avatar Olivier Bertrand

- Fix to MDEV-9579 be testing for void result.

  modified:   storage/connect/tabodbc.cpp
parent 481e6433
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
/* */ /* */
/* COPYRIGHT: */ /* COPYRIGHT: */
/* ---------- */ /* ---------- */
/* (C) Copyright to the author Olivier BERTRAND 2000-2015 */ /* (C) Copyright to the author Olivier BERTRAND 2000-2016 */
/* */ /* */
/* WHAT THIS PROGRAM DOES: */ /* WHAT THIS PROGRAM DOES: */
/* ----------------------- */ /* ----------------------- */
...@@ -912,19 +912,21 @@ bool TDBODBC::OpenDB(PGLOBAL g) ...@@ -912,19 +912,21 @@ bool TDBODBC::OpenDB(PGLOBAL g)
if ((n = Ocp->GetResultSize(Query->GetStr(), Cnp)) < 0) { if ((n = Ocp->GetResultSize(Query->GetStr(), Cnp)) < 0) {
strcpy(g->Message, "Cannot get result size"); strcpy(g->Message, "Cannot get result size");
return true; return true;
} // endif n } else if (n) {
Ocp->m_Rows = n;
Ocp->m_Rows = n; if ((Qrp = Ocp->AllocateResult(g)))
Memory = 2; // Must be filled
else {
strcpy(g->Message, "Result set memory allocation failed");
return true;
} // endif n
if ((Qrp = Ocp->AllocateResult(g))) } else // Void result
Memory = 2; // Must be filled Memory = 0;
else {
strcpy(g->Message, "Result set memory allocation failed");
return true;
} // endif n
Ocp->m_Rows = 0; Ocp->m_Rows = 0;
} else } else
return true; return true;
} // endif Memory } // endif Memory
......
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