diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-22 17:53:02 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-22 17:53:02 +0100 |
| commit | a736e63f7c494b0611a27a8951bf8fe0980cbaad (patch) | |
| tree | 490c119bbf03fa21f208eb599da6602ef81faa18 /storage/connect/plgdbutl.cpp | |
| parent | d9175f38227398c4084992809ec30cd48752d90d (diff) | |
| download | mariadb-git-a736e63f7c494b0611a27a8951bf8fe0980cbaad.tar.gz | |
- Add new Json UDF's Json_Array_Add, Json_Array_Grp and Json_Object_Grp.
Handle longjmp's raised during json processing.
modified:
storage/connect/global.h
storage/connect/ha_connect.cc
storage/connect/json.cpp
storage/connect/jsonudf.cpp
- Fix wrong references to the suppressed g->Trace variables.
modified:
storage/connect/global.h
storage/connect/plugutil.c
storage/connect/tabjson.cpp
storage/connect/tabodbc.cpp
Diffstat (limited to 'storage/connect/plgdbutl.cpp')
| -rw-r--r-- | storage/connect/plgdbutl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp index d8009bcc71f..d5429e8a344 100644 --- a/storage/connect/plgdbutl.cpp +++ b/storage/connect/plgdbutl.cpp @@ -311,7 +311,7 @@ PQRYRES PlgAllocResult(PGLOBAL g, int ncol, int maxres, int ids, else crp->Kdata = NULL; - if (g->Trace) + if (trace) htrc("Column(%d) %s type=%d len=%d value=%p\n", crp->Ncol, crp->Name, crp->Type, crp->Length, crp->Kdata); |