database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix clang compile error in tabjson and typo in tabbson.cpp

Browse Source
This commit is contained in:
Olivier Bertrand
2021-06-25 12:54:34 +02:00
parent af7a0895ac
commit 7863554e42
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/tabbson.cpp
View File

@@ -1492,7 +1492,7 @@ int TDBBSN::EstimatedLength(void)
} // end of Estimated Length
/***********************************************************************/
/* OpenDB: Data Base open routine for JSN access method. */
/* OpenDB: Data Base open routine for BSN access method. */
/***********************************************************************/
bool TDBBSN::OpenDB(PGLOBAL g)
{

6
storage/connect/tabjson.cpp
View File

@@ -1173,7 +1173,7 @@ int TDBJSN::ReadDB(PGLOBAL g) {
/***********************************************************************/
/* 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 (!Val) {
@@ -1210,7 +1210,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
// Old style
if (objpath[strlen(objpath) - 1] != ']') {
sprintf(g->Message, "Invalid Table path %s", Objname);
return NULL;
return true;
} else if (!bp)
objpath++;
@@ -1239,7 +1239,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
} else
Top = jsp;
return RC_OK;
return false;
} // end of MakeTopTree
/***********************************************************************/

2
storage/connect/tabjson.h
View File

@@ -170,7 +170,7 @@ public:
protected:
PJSON FindRow(PGLOBAL g);
int MakeTopTree(PGLOBAL g, PJSON jsp);
bool MakeTopTree(PGLOBAL g, PJSON jsp);
// Members
PGLOBAL G; // Support of parse memory