diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2021-06-25 12:54:34 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2021-06-25 12:54:34 +0200 |
| commit | 7863554e429d008c88ceff9d48c00eb10ea7d133 (patch) | |
| tree | 3d9fd57ade2d0c757ef404504c7c5b6ce807b417 | |
| parent | af7a0895ac6f57db0d4c83bede1a6115e9e11c1f (diff) | |
| download | mariadb-git-7863554e429d008c88ceff9d48c00eb10ea7d133.tar.gz | |
Fix clang compile error in tabjson and typo in tabbson.cpp
| -rw-r--r-- | storage/connect/tabbson.cpp | 2 | ||||
| -rw-r--r-- | storage/connect/tabjson.cpp | 6 | ||||
| -rw-r--r-- | storage/connect/tabjson.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/storage/connect/tabbson.cpp b/storage/connect/tabbson.cpp index 05c47014e5c..7f5727a9713 100644 --- a/storage/connect/tabbson.cpp +++ b/storage/connect/tabbson.cpp @@ -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) { diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp index de85344f869..2db42cc8cbf 100644 --- a/storage/connect/tabjson.cpp +++ b/storage/connect/tabjson.cpp @@ -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 /***********************************************************************/ diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h index 523015c66b2..623e5b6d509 100644 --- a/storage/connect/tabjson.h +++ b/storage/connect/tabjson.h @@ -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 |