diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-04 01:02:27 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-04 01:02:27 +0100 |
| commit | 0ec89291f139a881471020a216b52333e965156e (patch) | |
| tree | ca2ef596a8038429a8534f32a099e251c1948f16 /storage/connect/jsonudf.h | |
| parent | 8a860fda0c1b0c9fda2fcddc0d3392a20d76a9d8 (diff) | |
| download | mariadb-git-0ec89291f139a881471020a216b52333e965156e.tar.gz | |
Remove warning on Linux
modified: storage/connect/filamzip.cpp
Avoid calling the wrong AddValue (Windows compiler error ???)
modified: storage/connect/json.h
Fix looping bug in JARRAY::AddValue for arrays having one value.
Fix potential crash in JVALUE::SetValue
modified: storage/connect/json.cpp
Many changes to fix bugs, enhance memory handling and modify Jpath.
In JSNX some functions have been re-written or added to handle new Jpath.
BMX was re-defined to avoid a different size between Windows an Linux.
Jbin memory was fixed to use the proper memory when adding values.
Default pretty value is now 0 instead of 2.
Filename is stored in BSON when IsJson == 2.
BSON size is added to memlen in CalcLen when applicable.
The order or parameter was switch in Json_Object_Grp.
File name argument must be a constant (temporary?)
Json_Set_Item now returns file name when applicable.
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
Include "mycat.h"
modified: storage/connect/mycat.cc
Udf_json test revisited and fixed for Linux
modified: storage/connect/mysql-test/connect/r/json_udf.result
modified: storage/connect/mysql-test/connect/t/json_udf.inc
modified: storage/connect/mysql-test/connect/t/json_udf.test
modified: storage/connect/mysql-test/connect/t/json_udf2.inc
Diffstat (limited to 'storage/connect/jsonudf.h')
| -rw-r--r-- | storage/connect/jsonudf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/jsonudf.h b/storage/connect/jsonudf.h index dd39589f5c1..ecbbb778214 100644 --- a/storage/connect/jsonudf.h +++ b/storage/connect/jsonudf.h @@ -239,7 +239,7 @@ public: my_bool SetJpath(PGLOBAL g, char *path, my_bool jb = false); my_bool ParseJpath(PGLOBAL g); void ReadValue(PGLOBAL g); - PJVAL GetValue(PGLOBAL g, PJSON row, int i, my_bool b = true); + PJVAL GetRowValue(PGLOBAL g, PJSON row, int i, my_bool b = true); PJVAL GetJson(PGLOBAL g); my_bool CheckPath(PGLOBAL g); my_bool WriteValue(PGLOBAL g, PJVAL jvalp); @@ -288,4 +288,5 @@ protected: my_bool Parsed; // True when parsed my_bool Found; // Item found by locate my_bool Wr; // Write mode + my_bool Jb; // Must return json item }; // end of class JSNX |