diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-05-20 11:19:44 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-05-20 11:19:44 +0200 |
| commit | 37840d5313213a6c704386c09090569935e97ecb (patch) | |
| tree | b053be2452f92cb0821e1a50ef4fb190215221a9 /storage/connect/tabjson.cpp | |
| parent | db33294fdc3733bfd4bd7b280e049a8a1663cfa5 (diff) | |
| download | mariadb-git-37840d5313213a6c704386c09090569935e97ecb.tar.gz | |
Security: EOM modules must now be loaded from the plugin directory.
modified: storage/connect/mycat.cc
modified: storage/connect/reldef.cpp
Json array index (position) always defaults to 0
modified: storage/connect/tabjson.cpp
Diffstat (limited to 'storage/connect/tabjson.cpp')
| -rw-r--r-- | storage/connect/tabjson.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp index 6d3bbeaa56f..34d5827345f 100644 --- a/storage/connect/tabjson.cpp +++ b/storage/connect/tabjson.cpp @@ -449,7 +449,7 @@ TDBJSN::TDBJSN(PJDEF tdp, PTXF txfp) : TDBDOS(tdp, txfp) Xcol = NULL; Limit = 1; Pretty = 0; - B = 1; + B = 0; Strict = false; } // endif tdp @@ -477,6 +477,7 @@ TDBJSN::TDBJSN(TDBJSN *tdbp) : TDBDOS(NULL, tdbp) NextSame = tdbp->NextSame; SameRow = tdbp->SameRow; Xval = tdbp->Xval; + B = tdbp->B; Pretty = tdbp->Pretty; Strict = tdbp->Strict; Comma = tdbp->Comma; |