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
7863554e
Commit
7863554e
authored
Jun 25, 2021
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix clang compile error in tabjson and typo in tabbson.cpp
parent
af7a0895
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
storage/connect/tabbson.cpp
storage/connect/tabbson.cpp
+1
-1
storage/connect/tabjson.cpp
storage/connect/tabjson.cpp
+3
-3
storage/connect/tabjson.h
storage/connect/tabjson.h
+1
-1
No files found.
storage/connect/tabbson.cpp
View file @
7863554e
...
@@ -1492,7 +1492,7 @@ int TDBBSN::EstimatedLength(void)
...
@@ -1492,7 +1492,7 @@ int TDBBSN::EstimatedLength(void)
}
// end of Estimated Length
}
// end of Estimated Length
/***********************************************************************/
/***********************************************************************/
/* OpenDB: Data Base open routine for
J
SN access method. */
/* OpenDB: Data Base open routine for
B
SN access method. */
/***********************************************************************/
/***********************************************************************/
bool
TDBBSN
::
OpenDB
(
PGLOBAL
g
)
bool
TDBBSN
::
OpenDB
(
PGLOBAL
g
)
{
{
...
...
storage/connect/tabjson.cpp
View file @
7863554e
...
@@ -1173,7 +1173,7 @@ int TDBJSN::ReadDB(PGLOBAL g) {
...
@@ -1173,7 +1173,7 @@ int TDBJSN::ReadDB(PGLOBAL g) {
/***********************************************************************/
/***********************************************************************/
/* Make the top tree from the object path. */
/* Make the top tree from the object path. */
/***********************************************************************/
/***********************************************************************/
int
TDBJSN
::
MakeTopTree
(
PGLOBAL
g
,
PJSON
jsp
)
bool
TDBJSN
::
MakeTopTree
(
PGLOBAL
g
,
PJSON
jsp
)
{
{
if
(
Objname
)
{
if
(
Objname
)
{
if
(
!
Val
)
{
if
(
!
Val
)
{
...
@@ -1210,7 +1210,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
...
@@ -1210,7 +1210,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
// Old style
// Old style
if
(
objpath
[
strlen
(
objpath
)
-
1
]
!=
']'
)
{
if
(
objpath
[
strlen
(
objpath
)
-
1
]
!=
']'
)
{
sprintf
(
g
->
Message
,
"Invalid Table path %s"
,
Objname
);
sprintf
(
g
->
Message
,
"Invalid Table path %s"
,
Objname
);
return
NULL
;
return
true
;
}
else
if
(
!
bp
)
}
else
if
(
!
bp
)
objpath
++
;
objpath
++
;
...
@@ -1239,7 +1239,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
...
@@ -1239,7 +1239,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
}
else
}
else
Top
=
jsp
;
Top
=
jsp
;
return
RC_OK
;
return
false
;
}
// end of MakeTopTree
}
// end of MakeTopTree
/***********************************************************************/
/***********************************************************************/
...
...
storage/connect/tabjson.h
View file @
7863554e
...
@@ -170,7 +170,7 @@ class DllExport TDBJSN : public TDBDOS {
...
@@ -170,7 +170,7 @@ class DllExport TDBJSN : public TDBDOS {
protected:
protected:
PJSON
FindRow
(
PGLOBAL
g
);
PJSON
FindRow
(
PGLOBAL
g
);
int
MakeTopTree
(
PGLOBAL
g
,
PJSON
jsp
);
bool
MakeTopTree
(
PGLOBAL
g
,
PJSON
jsp
);
// Members
// Members
PGLOBAL
G
;
// Support of parse memory
PGLOBAL
G
;
// Support of parse 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