diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-07 16:24:53 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-07 16:24:53 +0200 |
commit | cdf00b8d92f9f49b33c7cf3f4390cb3d810f9c33 (patch) | |
tree | b6b55aaf1152d64829518e81110ba94ae8659192 /storage/connect/json.h | |
parent | f5b0993bbdf8ce4b25cfb008fd57159cdcece6f7 (diff) | |
download | mariadb-git-cdf00b8d92f9f49b33c7cf3f4390cb3d810f9c33.tar.gz |
- Fix bug returning pointer to a stack string
in JVALUE::GetString
modified: storage/connect/json.cpp
modified: storage/connect/json.h
modified: storage/connect/jsonudf.cpp
- Fix a compiler bug happening on some configuration and platforms
in JSNX::CalculateArray
modified: storage/connect/jsonudf.cpp
- Set default Schema as current directory
This fix several bugs like:
Fail to make JSON catalog tables
Fail to use zipped file made by a file LOAD
modified: storage/connect/reldef.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
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 daed055435b..26e69fe0995 100644 --- a/storage/connect/json.h +++ b/storage/connect/json.h @@ -165,7 +165,7 @@ class JSON : public BLOCK { virtual PJPR GetFirst(void) {X return NULL;} virtual int GetInteger(void) {X return 0;} virtual double GetFloat() {X return 0.0;} - virtual PSZ GetString() {X return NULL;} + virtual PSZ GetString(PGLOBAL g) {X return NULL;} virtual PSZ GetText(PGLOBAL g, PSZ text) {X return NULL;} virtual bool Merge(PGLOBAL g, PJSON jsp) { X return true; } virtual bool SetValue(PGLOBAL g, PJVAL jvp, int i) { X return true; } @@ -275,7 +275,7 @@ class JVALUE : public JSON { virtual int GetInteger(void); virtual long long GetBigint(void); virtual double GetFloat(void); - virtual PSZ GetString(void); + virtual PSZ GetString(PGLOBAL g); virtual PSZ GetText(PGLOBAL g, PSZ text); virtual void SetValue(PJSON jsp); virtual void SetValue(PVAL valp) { Value = valp; Jsp = NULL; } |