diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-02-20 10:40:32 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-02-20 10:40:32 +0100 |
| commit | 539b7368b3a4a89cb1a395b8a73f08dfafe14a96 (patch) | |
| tree | 0b491b642d3dd4aa29abc18dba0f8970eb943c61 | |
| parent | 31d2c024201235da4d50fb6767d2ec26562bd67a (diff) | |
| parent | 02fa3b8eea24ae3366d2f0bd69db487ccf33c715 (diff) | |
| download | mariadb-git-539b7368b3a4a89cb1a395b8a73f08dfafe14a96.tar.gz | |
Merge branch 'ob-10.0' into 10.0
| -rw-r--r-- | storage/connect/tabodbc.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp index fd9a049a05a..b8961789ccd 100644 --- a/storage/connect/tabodbc.cpp +++ b/storage/connect/tabodbc.cpp @@ -5,7 +5,7 @@ /* */ /* COPYRIGHT: */ /* ---------- */ -/* (C) Copyright to the author Olivier BERTRAND 2000-2015 */ +/* (C) Copyright to the author Olivier BERTRAND 2000-2016 */ /* */ /* WHAT THIS PROGRAM DOES: */ /* ----------------------- */ @@ -912,19 +912,21 @@ bool TDBODBC::OpenDB(PGLOBAL g) if ((n = Ocp->GetResultSize(Query->GetStr(), Cnp)) < 0) { strcpy(g->Message, "Cannot get result size"); 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))) - Memory = 2; // Must be filled - else { - strcpy(g->Message, "Result set memory allocation failed"); - return true; - } // endif n + } else // Void result + Memory = 0; - Ocp->m_Rows = 0; - } else + Ocp->m_Rows = 0; + } else return true; } // endif Memory |