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
fa5f26b4
Commit
fa5f26b4
authored
Sep 22, 2022
by
Andrew Hutchings
Committed by
Daniel Black
Oct 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-29578 Fix CONNECT build warnings
Fix a couple of build warnings that fire with CONNECT engine.
parent
055cb3fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
storage/connect/bsonudf.cpp
storage/connect/bsonudf.cpp
+4
-4
storage/connect/filamdbf.cpp
storage/connect/filamdbf.cpp
+1
-1
No files found.
storage/connect/bsonudf.cpp
View file @
fa5f26b4
...
...
@@ -3571,14 +3571,14 @@ char *bson_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
if
(
!
CheckMemory
(
g
,
initid
,
args
,
2
,
false
,
false
,
true
))
{
JTYP
type
;
BJNX
bnx
(
g
);
PBVAL
jvp
,
top
=
NULL
;
PBVAL
jvp
=
NULL
,
top
=
NULL
;
PBVAL
jsp
[
2
]
=
{
NULL
,
NULL
};
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
jvp
=
bnx
.
MakeValue
(
args
,
i
,
true
);
if
(
i
)
{
if
(
jvp
->
Type
!=
type
)
{
if
(
jvp
&&
(
jvp
->
Type
!=
type
)
)
{
PUSH_WARNING
(
"Argument types mismatch"
);
goto
fin
;
}
// endif type
...
...
@@ -5722,14 +5722,14 @@ char *bbin_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
if
(
!
CheckMemory
(
g
,
initid
,
args
,
2
,
false
,
false
,
true
))
{
JTYP
type
;
BJNX
bnx
(
g
);
PBVAL
jvp
,
top
=
NULL
;
PBVAL
jvp
=
NULL
,
top
=
NULL
;
PBVAL
jsp
[
2
]
=
{
NULL
,
NULL
};
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
if
(
i
)
{
jvp
=
bnx
.
MakeValue
(
args
,
i
,
true
);
if
(
jvp
->
Type
!=
type
)
{
if
(
jvp
&&
(
jvp
->
Type
!=
type
)
)
{
PUSH_WARNING
(
"Argument types mismatch"
);
goto
fin
;
}
// endif type
...
...
storage/connect/filamdbf.cpp
View file @
fa5f26b4
...
...
@@ -244,7 +244,7 @@ PQRYRES DBFColumns(PGLOBAL g, PCSZ dp, PCSZ fn, PTOS topt, bool info)
int
rc
,
type
,
len
,
field
,
fields
;
bool
bad
,
mul
;
PCSZ
target
,
pwd
;
DBFHEADER
mainhead
,
*
hp
;
DBFHEADER
mainhead
,
*
hp
=
NULL
;
DESCRIPTOR
thisfield
,
*
tfp
;
FILE
*
infile
=
NULL
;
UNZIPUTL
*
zutp
=
NULL
;
...
...
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