database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Add new Json UDF's Json_Array_Add, Json_Array_Grp and Json_Object_Grp.

Browse Source 
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
This commit is contained in:
Olivier Bertrand
2015-02-22 17:53:02 +01:00
parent d9175f3822
commit a736e63f7c
8 changed files with 131 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/plgdbutl.cpp
View File

@@ -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);