1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tracking branch 'connect/10.1' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik 2016-02-23 22:16:35 +01:00
commit 88576b3a80
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/tabodbc.cpp
View File

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