Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
02fa3b8e
Commit
02fa3b8e
authored
Feb 20, 2016
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fix to MDEV-9579 be testing for void result.
modified: storage/connect/tabodbc.cpp
parent
481e6433
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
11 deletions
+13
-11
storage/connect/tabodbc.cpp
storage/connect/tabodbc.cpp
+13
-11
No files found.
storage/connect/tabodbc.cpp
View file @
02fa3b8e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
/* */
/* */
/* COPYRIGHT: */
/* COPYRIGHT: */
/* ---------- */
/* ---------- */
/* (C) Copyright to the author Olivier BERTRAND 2000-201
5
*/
/* (C) Copyright to the author Olivier BERTRAND 2000-201
6
*/
/* */
/* */
/* WHAT THIS PROGRAM DOES: */
/* WHAT THIS PROGRAM DOES: */
/* ----------------------- */
/* ----------------------- */
...
@@ -912,19 +912,21 @@ bool TDBODBC::OpenDB(PGLOBAL g)
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment