Merge tracking branch 'connect/10.1' into 10.1

88576b3a · Sergei Golubchik · a5679af1 · 69042ffe · 88576b3a
Commit 88576b3a authored Feb 23, 2016 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

storage/connect/tabodbc.cpp storage/connect/tabodbc.cpp +12 -10

No files found.
--- a/storage/connect/tabodbc.cpp
+++ b/storage/connect/tabodbc.cpp
@@ -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)))
+				} 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;
      } // endif Memory