summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2020-11-08 12:14:33 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2020-11-08 12:14:33 +0100
commit73850edd044130402abf796beaa8c4bc94b6d81e (patch)
tree1892eb4becdf77c3798abec766066ab58231ddfb
parent90405763cf71a18ae1c7556fe51e13feb5333e46 (diff)
downloadmariadb-git-73850edd044130402abf796beaa8c4bc94b6d81e.tar.gz
Re-fix compile error (conversion-null) Modified json.cpp
-rw-r--r--storage/connect/json.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
index 5a7570567c8..5e04f65f748 100644
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -1892,7 +1892,7 @@ PJAR SWAP::MptrArray(PJAR ojar) {
PJOB SWAP::MptrObject(PJOB ojob) {
PJOB jobp = (PJOB)MakePtr(Base, (size_t)ojob);
- jobp = (PJOB)new((long long)jobp) JOBJECT(NULL);
+ jobp = (PJOB)new((long long)jobp) JOBJECT(0);
if (jobp->First) {
jobp->First = (PJPR)MptrPair(jobp->First);