summaryrefslogtreecommitdiff
path: root/storage/connect/tabjson.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2020-10-01 19:18:26 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2020-10-01 19:18:26 +0200
commit99ab562a92c05896ffb54216602507c56ea4e101 (patch)
tree49ea870ad1fe583f97fab9edba44e1681bcedc80 /storage/connect/tabjson.cpp
parentad0d2424dd72d7414e9c26ca0c50d67710c50af7 (diff)
downloadmariadb-git-99ab562a92c05896ffb54216602507c56ea4e101.tar.gz
- Make possible to allocate work space larger than 4GB
All variables handling sizes that were uint are now size_t. The variable connect_work_size is now ulong (was uint); Also make Json functiosn to allocate a larger memory (M=9 was 7) modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/json.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/plugutil.cpp modified: storage/connect/user_connect.cc - Fix uninitialised variable (pretty) in Json_File. Make Jbin_file accept the same arguments as Json_File ones. modified: storage/connect/jsonudf.cpp - Change the Level option to Depth (the word currently used) (Level being still accepted) modified: storage/connect/mongo.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabxml.cpp - Suppress 2nd argument default value for MYSQLtoPLG function modified: storage/connect/myutil.h - Allow REST tables to be create not specifying a file_name modified: storage/connect/tabrest.cpp
Diffstat (limited to 'storage/connect/tabjson.cpp')
-rw-r--r--storage/connect/tabjson.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp
index 3b0d458a7a6..08040884449 100644
--- a/storage/connect/tabjson.cpp
+++ b/storage/connect/tabjson.cpp
@@ -177,8 +177,8 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
bool mgo = (GetTypeID(topt->type) == TAB_MONGO);
PCSZ level = GetStringTableOption(g, topt, "Level", NULL);
- if (level) {
- lvl = atoi(level);
+ if (level = GetStringTableOption(g, topt, "Depth", level)) {
+ lvl = atoi(level);
lvl = (lvl > 16) ? 16 : lvl;
} else
lvl = 0;