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
a6cd4612
Commit
a6cd4612
authored
Mar 10, 2021
by
David CARLIER
Committed by
Anel
Mar 11, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
connect storage, little compile issues fix proposal.
parent
f11b6087
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
storage/connect/bsonudf.cpp
storage/connect/bsonudf.cpp
+6
-6
storage/connect/jsonudf.cpp
storage/connect/jsonudf.cpp
+3
-3
No files found.
storage/connect/bsonudf.cpp
View file @
a6cd4612
...
@@ -653,7 +653,7 @@ PVAL BJNX::GetCalcValue(PGLOBAL g, PBVAL bap, int n)
...
@@ -653,7 +653,7 @@ PVAL BJNX::GetCalcValue(PGLOBAL g, PBVAL bap, int n)
{
{
// For calculated arrays, a local Value must be used
// For calculated arrays, a local Value must be used
int
lng
=
0
;
int
lng
=
0
;
short
type
,
prec
=
0
;
short
type
=
0
,
prec
=
0
;
bool
b
=
n
<
Nod
-
1
;
bool
b
=
n
<
Nod
-
1
;
PVAL
valp
;
PVAL
valp
;
PBVAL
vlp
,
vp
;
PBVAL
vlp
,
vp
;
...
@@ -4714,7 +4714,7 @@ char *bfile_convert(UDF_INIT* initid, UDF_ARGS* args, char* result,
...
@@ -4714,7 +4714,7 @@ char *bfile_convert(UDF_INIT* initid, UDF_ARGS* args, char* result,
str
=
(
char
*
)
g
->
Xchk
;
str
=
(
char
*
)
g
->
Xchk
;
if
(
!
str
)
{
if
(
!
str
)
{
PUSH_WARNING
(
g
->
Message
?
g
->
Message
:
"Unexpected error"
);
PUSH_WARNING
(
g
->
Message
[
0
]
!=
'\0'
?
g
->
Message
:
"Unexpected error"
);
*
is_null
=
1
;
*
is_null
=
1
;
*
error
=
1
;
*
error
=
1
;
*
res_length
=
0
;
*
res_length
=
0
;
...
@@ -4774,7 +4774,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
...
@@ -4774,7 +4774,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
if
(
!
g
->
Xchk
)
{
if
(
!
g
->
Xchk
)
{
int
msgid
=
MSGID_OPEN_MODE_STRERROR
;
int
msgid
=
MSGID_OPEN_MODE_STRERROR
;
FILE
*
fout
;
FILE
*
fout
=
NULL
;
FILE
*
fin
;
FILE
*
fin
;
if
(
!
(
fin
=
global_fopen
(
g
,
msgid
,
fn
,
"rt"
)))
if
(
!
(
fin
=
global_fopen
(
g
,
msgid
,
fn
,
"rt"
)))
...
@@ -4837,7 +4837,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
...
@@ -4837,7 +4837,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
str
=
(
char
*
)
g
->
Xchk
;
str
=
(
char
*
)
g
->
Xchk
;
if
(
!
str
)
{
if
(
!
str
)
{
if
(
g
->
Message
)
if
(
g
->
Message
[
0
]
!=
'\0'
)
str
=
strcpy
(
result
,
g
->
Message
);
str
=
strcpy
(
result
,
g
->
Message
);
else
else
str
=
strcpy
(
result
,
"Unexpected error"
);
str
=
strcpy
(
result
,
"Unexpected error"
);
...
@@ -5003,7 +5003,7 @@ char *bbin_array_add(UDF_INIT *initid, UDF_ARGS *args, char *result,
...
@@ -5003,7 +5003,7 @@ char *bbin_array_add(UDF_INIT *initid, UDF_ARGS *args, char *result,
uint
n
=
2
;
uint
n
=
2
;
int
*
x
=
GetIntArgPtr
(
g
,
args
,
n
);
int
*
x
=
GetIntArgPtr
(
g
,
args
,
n
);
BJNX
bnx
(
g
,
NULL
,
TYPE_STRING
);
BJNX
bnx
(
g
,
NULL
,
TYPE_STRING
);
PBVAL
jarp
,
top
,
jvp
=
NULL
;
PBVAL
top
,
jarp
=
NULL
,
jvp
=
NULL
;
PBVAL
jsp
=
bnx
.
MakeValue
(
args
,
0
,
true
,
&
top
);
PBVAL
jsp
=
bnx
.
MakeValue
(
args
,
0
,
true
,
&
top
);
if
(
bnx
.
CheckPath
(
g
,
args
,
jsp
,
jvp
,
2
))
if
(
bnx
.
CheckPath
(
g
,
args
,
jsp
,
jvp
,
2
))
...
@@ -5636,7 +5636,7 @@ char *bbin_object_values(UDF_INIT *initid, UDF_ARGS *args, char *result,
...
@@ -5636,7 +5636,7 @@ char *bbin_object_values(UDF_INIT *initid, UDF_ARGS *args, char *result,
if
(
!
bsp
)
{
if
(
!
bsp
)
{
if
(
!
CheckMemory
(
g
,
initid
,
args
,
1
,
true
,
true
))
{
if
(
!
CheckMemory
(
g
,
initid
,
args
,
1
,
true
,
true
))
{
BJNX
bnx
(
g
);
BJNX
bnx
(
g
);
PBVAL
top
,
jarp
;
PBVAL
top
,
jarp
=
NULL
;
PBVAL
jvp
=
bnx
.
MakeValue
(
args
,
0
,
true
,
&
top
);
PBVAL
jvp
=
bnx
.
MakeValue
(
args
,
0
,
true
,
&
top
);
if
(
jvp
->
Type
==
TYPE_JOB
)
{
if
(
jvp
->
Type
==
TYPE_JOB
)
{
...
...
storage/connect/jsonudf.cpp
View file @
a6cd4612
...
@@ -5865,7 +5865,7 @@ char *jfile_convert(UDF_INIT* initid, UDF_ARGS* args, char* result,
...
@@ -5865,7 +5865,7 @@ char *jfile_convert(UDF_INIT* initid, UDF_ARGS* args, char* result,
str
=
(
char
*
)
g
->
Xchk
;
str
=
(
char
*
)
g
->
Xchk
;
if
(
!
str
)
{
if
(
!
str
)
{
PUSH_WARNING
(
g
->
Message
?
g
->
Message
:
"Unexpected error"
);
PUSH_WARNING
(
g
->
Message
[
0
]
!=
'\0'
?
g
->
Message
:
"Unexpected error"
);
*
is_null
=
1
;
*
is_null
=
1
;
*
error
=
1
;
*
error
=
1
;
*
res_length
=
0
;
*
res_length
=
0
;
...
@@ -5926,7 +5926,7 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
...
@@ -5926,7 +5926,7 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
if
(
!
g
->
Xchk
)
{
if
(
!
g
->
Xchk
)
{
int
msgid
=
MSGID_OPEN_MODE_STRERROR
;
int
msgid
=
MSGID_OPEN_MODE_STRERROR
;
FILE
*
fout
;
FILE
*
fout
=
NULL
;
FILE
*
fin
;
FILE
*
fin
;
if
(
!
(
fin
=
global_fopen
(
g
,
msgid
,
fn
,
"rt"
)))
if
(
!
(
fin
=
global_fopen
(
g
,
msgid
,
fn
,
"rt"
)))
...
@@ -5993,7 +5993,7 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
...
@@ -5993,7 +5993,7 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
str
=
(
char
*
)
g
->
Xchk
;
str
=
(
char
*
)
g
->
Xchk
;
if
(
!
str
)
{
if
(
!
str
)
{
if
(
g
->
Message
)
if
(
g
->
Message
[
0
]
!=
'\0'
)
str
=
strcpy
(
result
,
g
->
Message
);
str
=
strcpy
(
result
,
g
->
Message
);
else
else
str
=
strcpy
(
result
,
"Unexpected error"
);
str
=
strcpy
(
result
,
"Unexpected error"
);
...
...
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