- 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

1 files changed, 6 insertions, 0 deletions

diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
index 251ba762a53..8031ba51b19 100644
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -74,6 +74,7 @@ PJSON ParseJson(PGLOBAL g, char *s, int len, int pretty, bool *comma)
           goto err;
         } else if (!(jsp = ParseObject(g, ++i, src)))
           goto err;
+
         break;
       case ' ':
       case '\t':
@@ -90,6 +91,11 @@ PJSON ParseJson(PGLOBAL g, char *s, int len, int pretty, bool *comma)
 
         sprintf(g->Message, "Unexpected ',' (pretty=%d)", pretty);
         goto err;
+      case '"':
+        if (!(jsp = ParseValue(g, i, src)))
+          goto err;
+
+        break;
       case '(':
         b = true;
         break;