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/json.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/json.h')
-rw-r--r-- | storage/connect/json.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/json.h b/storage/connect/json.h index 57d8dd0682a..4ea169e1b18 100644 --- a/storage/connect/json.h +++ b/storage/connect/json.h @@ -149,7 +149,7 @@ class JSON : public BLOCK { virtual JTYP GetType(void) {return TYPE_JSON;} virtual JTYP GetValType(void) {X return TYPE_JSON;} virtual void InitArray(PGLOBAL g) {X} - virtual PJVAL AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL) {X return NULL;} +//virtual PJVAL AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL) {X return NULL;} virtual PJPR AddPair(PGLOBAL g, PSZ key) {X return NULL;} virtual PJAR GetKeyList(PGLOBAL g) {X return NULL;} virtual PJVAL GetValue(const char *key) {X return NULL;} @@ -223,7 +223,7 @@ class JARRAY : public JSON { virtual void Clear(void) {First = Last = NULL; Size = 0;} virtual JTYP GetType(void) {return TYPE_JAR;} virtual PJAR GetArray(void) {return this;} - virtual PJVAL AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL); + PJVAL AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL); virtual void InitArray(PGLOBAL g); virtual PJVAL GetValue(int i); virtual bool Merge(PGLOBAL g, PJSON jsp); |