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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
94fb9d93
Commit
94fb9d93
authored
Oct 15, 2021
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MDEV-24493
parent
46fed496
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
storage/connect/colblk.h
storage/connect/colblk.h
+1
-1
storage/connect/odbconn.cpp
storage/connect/odbconn.cpp
+4
-5
No files found.
storage/connect/colblk.h
View file @
94fb9d93
/*************** Colblk H Declares Source Code File (.H) ***************/
/*************** Colblk H Declares Source Code File (.H) ***************/
/* Name: COLBLK.H Version 1.7 */
/* Name: COLBLK.H Version 1.7 */
/* */
/* */
/* (C) Copyright to the author Olivier BERTRAND 2005-201
5
*/
/* (C) Copyright to the author Olivier BERTRAND 2005-201
9
*/
/* */
/* */
/* This file contains the COLBLK and derived classes declares. */
/* This file contains the COLBLK and derived classes declares. */
/***********************************************************************/
/***********************************************************************/
...
...
storage/connect/odbconn.cpp
View file @
94fb9d93
/***********************************************************************/
/***********************************************************************/
/* Name: ODBCONN.CPP Version 2.
3
*/
/* Name: ODBCONN.CPP Version 2.
4
*/
/* */
/* */
/* (C) Copyright to the author Olivier BERTRAND 1998-20
17
*/
/* (C) Copyright to the author Olivier BERTRAND 1998-20
21
*/
/* */
/* */
/* This file contains the ODBC connection classes functions. */
/* This file contains the ODBC connection classes functions. */
/***********************************************************************/
/***********************************************************************/
...
@@ -1509,7 +1509,7 @@ int ODBConn::ExecDirectSQL(char *sql, ODBCCOL *tocols)
...
@@ -1509,7 +1509,7 @@ int ODBConn::ExecDirectSQL(char *sql, ODBCCOL *tocols)
ThrowDBX
(
MSG
(
COL_NUM_MISM
));
ThrowDBX
(
MSG
(
COL_NUM_MISM
));
// Now bind the column buffers
// Now bind the column buffers
for
(
n
=
1
,
colp
=
tocols
;
colp
;
colp
=
(
PODBCCOL
)
colp
->
GetNext
())
for
(
colp
=
tocols
;
colp
;
colp
=
(
PODBCCOL
)
colp
->
GetNext
())
if
(
!
colp
->
IsSpecial
())
{
if
(
!
colp
->
IsSpecial
())
{
buffer
=
colp
->
GetBuffer
(
m_RowsetSize
);
buffer
=
colp
->
GetBuffer
(
m_RowsetSize
);
len
=
colp
->
GetBuflen
();
len
=
colp
->
GetBuflen
();
...
@@ -1525,12 +1525,11 @@ int ODBConn::ExecDirectSQL(char *sql, ODBCCOL *tocols)
...
@@ -1525,12 +1525,11 @@ int ODBConn::ExecDirectSQL(char *sql, ODBCCOL *tocols)
htrc
(
"Binding col=%u type=%d buf=%p len=%d slen=%p
\n
"
,
htrc
(
"Binding col=%u type=%d buf=%p len=%d slen=%p
\n
"
,
n
,
tp
,
buffer
,
len
,
colp
->
GetStrLen
());
n
,
tp
,
buffer
,
len
,
colp
->
GetStrLen
());
rc
=
SQLBindCol
(
hstmt
,
n
,
tp
,
buffer
,
len
,
colp
->
GetStrLen
());
rc
=
SQLBindCol
(
hstmt
,
colp
->
GetIndex
()
,
tp
,
buffer
,
len
,
colp
->
GetStrLen
());
if
(
!
Check
(
rc
))
if
(
!
Check
(
rc
))
ThrowDBX
(
rc
,
"SQLBindCol"
,
hstmt
);
ThrowDBX
(
rc
,
"SQLBindCol"
,
hstmt
);
n
++
;
}
// endif pcol
}
// endif pcol
}
catch
(
DBX
*
x
)
{
}
catch
(
DBX
*
x
)
{
...
...
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