summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2021-06-25 12:30:10 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2021-06-25 12:30:10 +0200
commitaf7a0895ac6f57db0d4c83bede1a6115e9e11c1f (patch)
treed3e872bcdf592ee4de8f978f893faf7c2a177d38
parent6239e2a4ec4dc6ef6e99be73b8c5d7ad6e02cfc5 (diff)
downloadmariadb-git-af7a0895ac6f57db0d4c83bede1a6115e9e11c1f.tar.gz
Fix clang compile error in tabjson.cpp and tabbson.cpp
-rw-r--r--storage/connect/tabbson.cpp2
-rw-r--r--storage/connect/tabjson.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/tabbson.cpp b/storage/connect/tabbson.cpp
index dd37357ac6a..05c47014e5c 100644
--- a/storage/connect/tabbson.cpp
+++ b/storage/connect/tabbson.cpp
@@ -676,7 +676,7 @@ PBVAL BTUTIL::MakeTopTree(PGLOBAL g, int type)
if (!Tp->Row) {
// Parse and allocate Objpath item(s)
char *p, *objpath = PlugDup(g, Tp->Objname);
- char *sep = (Tp->Sep == ':') ? ":[" : ".[";
+ char *sep = (char*)(Tp->Sep == ':' ? ":[" : ".[");
int i;
bool bp = false, b = false;
PBVAL objp = NULL;
diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp
index 09077ecdf93..de85344f869 100644
--- a/storage/connect/tabjson.cpp
+++ b/storage/connect/tabjson.cpp
@@ -1179,7 +1179,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
if (!Val) {
// Parse and allocate Objname item(s)
char *p, *objpath = PlugDup(g, Objname);
- char *sep = (Sep == ':') ? ":[" : ".[";
+ char *sep = (char*)(Sep == ':' ? ":[" : ".[");
int i;
bool bp = false, b = false;
PJOB objp;