Merge branch 'ob-10.0' into 10.0

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,8 +912,7 @@ 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;
 
 					if ((Qrp = Ocp->AllocateResult(g)))
@@ -923,6 +922,9 @@ bool TDBODBC::OpenDB(PGLOBAL g)
 						return true;
 					} // endif n
 
+				} else				 // Void result
+					Memory = 0;
+
 				Ocp->m_Rows = 0;
 			} else
         return true;