diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 10:37:54 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 10:37:54 +0100 |
| commit | b3cecb7bfc88a72661e61b3c8ce3e6101ac4e9b5 (patch) | |
| tree | 09414bec882237d10661f4591d96ae31ae59166b /storage | |
| parent | 7f7e66147d326314370c210eaf2756b6619e20da (diff) | |
| download | mariadb-git-b3cecb7bfc88a72661e61b3c8ce3e6101ac4e9b5.tar.gz | |
Revert "Fix of warnings on aarch64 like:"
Fixed by the author in other way (char -> short)
This reverts commit 496f7090a825ac7ee54a6b5f9700e5f261e4bce0.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/bson.cpp | 6 | ||||
| -rw-r--r-- | storage/connect/bsonudf.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/connect/bson.cpp b/storage/connect/bson.cpp index fa24300f91f..7665d8520ab 100644 --- a/storage/connect/bson.cpp +++ b/storage/connect/bson.cpp @@ -769,7 +769,7 @@ bool BDOC::SerializeValue(PBVAL jvp, bool b) case TYPE_DBL: sprintf(buf, "%.*lf", jvp->Nd, *(double*)MakePtr(Base, jvp->To_Val)); return jp->WriteStr(buf); - case (char)TYPE_NULL: + case TYPE_NULL: return jp->WriteStr("null"); case TYPE_JVAL: return SerializeValue(MVP(jvp->To_Val)); @@ -1554,7 +1554,7 @@ PSZ BJSON::GetString(PBVAL vp, char* buff) case TYPE_BOOL: p = (PSZ)((vlp->B) ? "true" : "false"); break; - case (char)TYPE_NULL: + case TYPE_NULL: p = (PSZ)"null"; break; default: @@ -1771,7 +1771,7 @@ bool BJSON::IsValueNull(PBVAL vlp) bool b; switch (vlp->Type) { - case (char)TYPE_NULL: + case TYPE_NULL: b = true; break; case TYPE_JOB: diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp index a71cd2f0229..30cb69d1775 100644 --- a/storage/connect/bsonudf.cpp +++ b/storage/connect/bsonudf.cpp @@ -526,7 +526,7 @@ void BJNX::SetJsonValue(PGLOBAL g, PVAL vp, PBVAL vlp) case TYPE_JOB: vp->SetValue_psz(GetObjectText(g, vlp, NULL)); break; - case (char)TYPE_NULL: + case TYPE_NULL: vp->SetNull(true); default: vp->Reset(); @@ -1444,7 +1444,7 @@ my_bool BJNX::CompareValues(PGLOBAL g, PBVAL v1, PBVAL v2) b = (v1->B == v2->B); break; - case (char)TYPE_NULL: + case TYPE_NULL: b = (v2->Type == TYPE_NULL); break; default: |