- Adding json udf's. Making the second version of json tables.

added:
  storage/connect/jsonudf.cpp
modified:
  storage/connect/CMakeLists.txt
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h

- Fix utf8 issues with PROXY tables
modified:
  storage/connect/ha_connect.cc
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h

1 files changed, 4 insertions, 6 deletions

diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h
index a152db72fa8..f46a59c5498 100644
--- a/storage/connect/tabjson.h
+++ b/storage/connect/tabjson.h
@@ -15,9 +15,6 @@ enum JMODE {MODE_OBJECT, MODE_ARRAY, MODE_VALUE};
 typedef class JSONDEF *PJDEF;
 typedef class TDBJSON *PJTDB;
 typedef class JSONCOL *PJCOL;
-typedef class JARLST  *PJARS;
-
-class TDBJSN;
 
 /***********************************************************************/
 /*  The JSON tree node. Can be an Object or an Array.           	  	 */
@@ -133,9 +130,10 @@ class JSONCOL : public DOSCOL {
  protected:
   bool    CheckExpand(PGLOBAL g, int i, PSZ nm, bool b);
   bool    SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm);
-  PVAL    GetColumnValue(PGLOBAL g, PJSON row, int i);

-  PVAL    ExpandArray(PGLOBAL g, PJAR arp, int n);

-  PVAL    CalculateArray(PGLOBAL g, PJAR arp, int n);

+  PVAL    GetColumnValue(PGLOBAL g, PJSON row, int i);
+  PVAL    ExpandArray(PGLOBAL g, PJAR arp, int n);
+  PVAL    CalculateArray(PGLOBAL g, PJAR arp, int n);
+  PVAL    MakeJson(PGLOBAL g, PJSON jsp);
   void    SetJsonValue(PGLOBAL g, PVAL vp, PJVAL val, int n);
   PJSON   GetRow(PGLOBAL g);