mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
modified:   storage/connect/tabodbc.cpp
This commit is contained in:
Olivier Bertrand 2016-02-20 00:22:16 +01:00
parent d163ad338d
commit 69042ffe4e
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
storage/connect/tabodbc.cpp
View file

@ -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