Merge branch 'connect/10.1' into 10.1

storage/connect/CMakeLists.txt

@@ -28,8 +28,8 @@ tabvct.cpp tabvir.cpp tabxcl.cpp valblk.cpp value.cpp xindex.cpp xobject.cpp
 
 array.h blkfil.h block.h catalog.h checklvl.h colblk.h connect.h csort.h
 engmsg.h filamap.h filamdbf.h filamfix.h filamtxt.h filamvct.h filamzip.h
-filter.h global.h ha_connect.h inihandl.h json.h maputil.h msgid.h mycat.h
-myconn.h myutil.h os.h osutil.h plgcnx.h plgdbsem.h preparse.h reldef.h
+filter.h global.h ha_connect.h inihandl.h json.h jsonudf.h maputil.h msgid.h
+mycat.h myconn.h myutil.h os.h osutil.h plgcnx.h plgdbsem.h preparse.h reldef.h
 resource.h tabcol.h tabdos.h tabfix.h tabfmt.h tabjson.h tabmul.h tabmysql.h
 taboccur.h tabpivot.h tabsys.h tabtbl.h tabutil.h tabvct.h tabvir.h tabxcl.h
 user_connect.h valblk.h value.h xindex.h xobject.h xtable.h)

storage/connect/filamzip.cpp

@@ -1404,8 +1404,13 @@ void ZLBFAM::Rewind(void)
   // We must be positioned after the header block
   if (CurBlk >= 0) {   // Nothing to do if no block read yet
     if (!Optimized) {  // If optimized, fseek will be done in ReadBuffer
+			size_t st;
+
       rewind(Stream);
-      (void) fread(Zlenp, sizeof(int), 1, Stream);
+
+			if (!(st = fread(Zlenp, sizeof(int), 1, Stream)) && trace)
+				htrc("fread error %d in Rewind", errno);
+
       fseek(Stream, *Zlenp + sizeof(int), SEEK_SET);
       OldBlk = -1;
       } // endif Optimized

storage/connect/fmdlex.c

+#include <setjmp.h>
+
 #define yyFlexLexer fmdfFlexLexer
 #define yy_create_buffer fmdf_create_buffer
 #define yy_delete_buffer fmdf_delete_buffer
@@ -506,13 +508,16 @@ YY_MALLOC_DECL
 #define YY_BREAK break;
 #endif
 
+static jmp_buf env;
+
 YY_DECL
   {
   register yy_state_type yy_current_state;
   register char *yy_cp, *yy_bp;
   register int yy_act;
 
-
+	if (setjmp(env))
+		return -1;
 
   /*************************************************************************/
   /* Flex parser to analyze date format and produce input and/or output    */
@@ -1316,7 +1321,7 @@ char msg[];
 #endif
   {
   (void) fprintf( stderr, "%s\n", msg );
-  exit( 1 );
+  longjmp(env, 1 );
   }
 
 

storage/connect/ha_connect.cc

@@ -169,9 +169,9 @@
 #define JSONMAX      10             // JSON Default max grp size
 
 extern "C" {
-       char version[]= "Version 1.04.0003 October 25, 2015";
+       char version[]= "Version 1.04.0005 December 11, 2015";
 #if defined(__WIN__)
-       char compver[]= "Version 1.04.0003 " __DATE__ " "  __TIME__;
+       char compver[]= "Version 1.04.0005 " __DATE__ " "  __TIME__;
        char slash= '\\';
 #else   // !__WIN__
        char slash= '/';
@@ -6762,7 +6762,7 @@ maria_declare_plugin(connect)
   0x0104,                                       /* version number (1.04) */
   NULL,                                         /* status variables */
   connect_system_variables,                     /* system variables */
-  "1.04.0003",                                  /* string version */
+  "1.04.0005",                                  /* string version */
   MariaDB_PLUGIN_MATURITY_BETA                  /* maturity */
 }
 maria_declare_plugin_end;

storage/connect/json.cpp

@@ -534,15 +534,27 @@ PVAL ParseNumeric(PGLOBAL g, int& i, STRG& src)
 /***********************************************************************/
 PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty)
 {
+	PSZ   str = NULL;
   bool  b = false, err = true;
   JOUT *jp;
 	FILE *fs = NULL;
 
 	g->Message[0] = 0;
 
+	// Save stack and allocation environment and prepare error return
+	if (g->jump_level == MAX_JUMP) {
+		strcpy(g->Message, MSG(TOO_MANY_JUMPS));
+		return NULL;
+	} // endif jump_level
+
+	if (setjmp(g->jumper[++g->jump_level])) {
+		str = NULL;
+		goto fin;
+	} // endif jmp
+
 	if (!jsp) {
     strcpy(g->Message, "Null json tree");
-    return NULL;
+    goto fin;
   } else if (!fn) {
     // Serialize to a string
     jp = new(g) JOUTSTR(g);
@@ -552,7 +564,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty)
 			sprintf(g->Message, MSG(OPEN_MODE_ERROR),
 				"w", (int)errno, fn);
 			strcat(strcat(g->Message, ": "), strerror(errno));
-			return g->Message;
+			goto fin;;
 		} else if (pretty >= 2) {
 			// Serialize to a pretty file
 			jp = new(g)JOUTPRT(g, fs);
@@ -582,20 +594,20 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty)
   if (fs) {
 		fputs(EL, fs);
     fclose(fs);
-    return (err) ? g->Message : NULL;
+		str = (err) ? NULL : "Ok";
   } else if (!err) {
-    PSZ str = ((JOUTSTR*)jp)->Strp;
-
+    str = ((JOUTSTR*)jp)->Strp;
     jp->WriteChr('\0');
     PlugSubAlloc(g, NULL, ((JOUTSTR*)jp)->N);
-    return str;
   } else {
     if (!g->Message[0])
       strcpy(g->Message, "Error in Serialize");
 
-    return NULL;
   } // endif's
 
+fin:
+	g->jump_level--;
+	return str;
 } // end of Serialize
 
 /***********************************************************************/
@@ -1096,10 +1108,12 @@ PJVAL JARRAY::AddValue(PGLOBAL g, PJVAL jvp, int *x)
 			Last = jvp;
 
 	} else {
-		if (Last)
-			Last->Next = jvp;
-		else
+		if (!First)
 			First = jvp;
+		else if (Last == First)
+			First->Next = Last = jvp;
+		else
+			Last->Next = jvp;
 
 		Last = jvp;
 	} // endif x
@@ -1282,6 +1296,18 @@ PSZ JVALUE::GetText(PGLOBAL g, PSZ text)
   return text;
 } // end of GetText
 
+void JVALUE::SetValue(PJSON jsp)
+{ 
+	if (jsp && jsp->GetType() == TYPE_JVAL) {
+		Jsp = jsp->GetJsp();
+		Value = jsp->GetValue();
+	} else {
+		Jsp = jsp;
+		Value = NULL;
+	} // endif Type
+
+}	// end of SetValue;
+
 /***********************************************************************/
 /* Set the Value's value as the given integer.                         */
 /***********************************************************************/

storage/connect/json.h

@@ -149,7 +149,7 @@ class JSON : public BLOCK {
   virtual JTYP   GetType(void) {return TYPE_JSON;}
   virtual JTYP   GetValType(void) {X return TYPE_JSON;}
   virtual void   InitArray(PGLOBAL g) {X}
-  virtual PJVAL  AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL) {X return NULL;}
+//virtual PJVAL  AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL) {X return NULL;}
   virtual PJPR   AddPair(PGLOBAL g, PSZ key) {X return NULL;}
 	virtual PJAR   GetKeyList(PGLOBAL g) {X return NULL;}
 	virtual PJVAL  GetValue(const char *key) {X return NULL;}
@@ -223,7 +223,7 @@ class JARRAY : public JSON {
   virtual void  Clear(void) {First = Last = NULL; Size = 0;}
   virtual JTYP  GetType(void) {return TYPE_JAR;}
   virtual PJAR  GetArray(void) {return this;}
-  virtual PJVAL AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL);
+          PJVAL AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL);
   virtual void  InitArray(PGLOBAL g);
   virtual PJVAL GetValue(int i);
 	virtual bool  Merge(PGLOBAL g, PJSON jsp);
@@ -271,8 +271,8 @@ class JVALUE : public JSON {
 	virtual double GetFloat(void);
   virtual PSZ    GetString(void);
   virtual PSZ    GetText(PGLOBAL g, PSZ text);
-	virtual void   SetValue(PVAL valp) {Value = valp; Jsp = NULL;}
-	virtual void   SetValue(PJSON jsp) {Jsp = jsp; Value = NULL;}
+	virtual void   SetValue(PJSON jsp);
+	virtual void   SetValue(PVAL valp) { Value = valp; Jsp = NULL; }
 	virtual void   SetString(PGLOBAL g, PSZ s, short c = 0);
   virtual void   SetInteger(PGLOBAL g, int n);
 	virtual void   SetBigint(PGLOBAL g, longlong ll);

storage/connect/jsonudf.h

@@ -61,6 +61,10 @@ extern "C" {
 	DllExport char *json_object_nonull(UDF_EXEC_ARGS);
 	DllExport void json_object_nonull_deinit(UDF_INIT*);
 
+	DllExport my_bool json_object_key_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *json_object_key(UDF_EXEC_ARGS);
+	DllExport void json_object_key_deinit(UDF_INIT*);
+
 	DllExport my_bool json_object_add_init(UDF_INIT*, UDF_ARGS*, char*);
 	DllExport char *json_object_add(UDF_EXEC_ARGS);
 	DllExport void json_object_add_deinit(UDF_INIT*);
@@ -105,6 +109,10 @@ extern "C" {
 	DllExport double jsonget_real(UDF_INIT*, UDF_ARGS*, char*, char*);
 	DllExport void jsonget_real_deinit(UDF_INIT*);
 
+	DllExport my_bool jsoncontains_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport long long jsoncontains(UDF_EXEC_ARGS);
+	DllExport void jsoncontains_deinit(UDF_INIT*);
+
 	DllExport my_bool jsonlocate_init(UDF_INIT*, UDF_ARGS*, char*);
 	DllExport char *jsonlocate(UDF_EXEC_ARGS);
 	DllExport void jsonlocate_deinit(UDF_INIT*);
@@ -113,6 +121,22 @@ extern "C" {
 	DllExport char *json_locate_all(UDF_EXEC_ARGS);
 	DllExport void json_locate_all_deinit(UDF_INIT*);
 
+	DllExport my_bool jsoncontains_path_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport long long jsoncontains_path(UDF_EXEC_ARGS);
+	DllExport void jsoncontains_path_deinit(UDF_INIT*);
+
+	DllExport my_bool json_set_item_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *json_set_item(UDF_EXEC_ARGS);
+	DllExport void json_set_item_deinit(UDF_INIT*);
+
+	DllExport my_bool json_insert_item_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *json_insert_item(UDF_EXEC_ARGS);
+	DllExport void json_insert_item_deinit(UDF_INIT*);
+
+	DllExport my_bool json_update_item_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *json_update_item(UDF_EXEC_ARGS);
+	DllExport void json_update_item_deinit(UDF_INIT*);
+
 	DllExport my_bool json_file_init(UDF_INIT*, UDF_ARGS*, char*);
 	DllExport char *json_file(UDF_EXEC_ARGS);
 	DllExport void json_file_deinit(UDF_INIT*);
@@ -145,6 +169,10 @@ extern "C" {
 	DllExport char *jbin_object_nonull(UDF_EXEC_ARGS);
 	DllExport void jbin_object_nonull_deinit(UDF_INIT*);
 
+	DllExport my_bool jbin_object_key_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *jbin_object_key(UDF_EXEC_ARGS);
+	DllExport void jbin_object_key_deinit(UDF_INIT*);
+
 	DllExport my_bool jbin_object_add_init(UDF_INIT*, UDF_ARGS*, char*);
 	DllExport char *jbin_object_add(UDF_EXEC_ARGS);
 	DllExport void jbin_object_add_deinit(UDF_INIT*);
@@ -165,6 +193,18 @@ extern "C" {
 	DllExport char *jbin_item_merge(UDF_EXEC_ARGS);
 	DllExport void jbin_item_merge_deinit(UDF_INIT*);
 
+	DllExport my_bool jbin_set_item_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *jbin_set_item(UDF_EXEC_ARGS);
+	DllExport void jbin_set_item_deinit(UDF_INIT*);
+
+	DllExport my_bool jbin_insert_item_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *jbin_insert_item(UDF_EXEC_ARGS);
+	DllExport void jbin_insert_item_deinit(UDF_INIT*);
+
+	DllExport my_bool jbin_update_item_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *jbin_update_item(UDF_EXEC_ARGS);
+	DllExport void jbin_update_item_deinit(UDF_INIT*);
+
 	DllExport my_bool jbin_file_init(UDF_INIT*, UDF_ARGS*, char*);
 	DllExport char *jbin_file(UDF_EXEC_ARGS);
 	DllExport void jbin_file_deinit(UDF_INIT*);
@@ -189,7 +229,7 @@ typedef struct _jpn {
 class JSNX : public BLOCK {
 public:
 	// Constructors
-	JSNX(PGLOBAL g, PJSON row, int type, int len = 64, int prec = 0);
+	JSNX(PGLOBAL g, PJSON row, int type, int len = 64, int prec = 0, my_bool wr = false);
 
 	// Implementation
 	int     GetPrecision(void) {return Prec;}
@@ -199,8 +239,10 @@ public:
 	my_bool SetJpath(PGLOBAL g, char *path, my_bool jb = false);
 	my_bool ParseJpath(PGLOBAL g);
 	void    ReadValue(PGLOBAL g);
-	PJVAL   GetValue(PGLOBAL g, PJSON row, int i, my_bool b = true);
+	PJVAL   GetRowValue(PGLOBAL g, PJSON row, int i, my_bool b = true);
 	PJVAL   GetJson(PGLOBAL g);
+	my_bool CheckPath(PGLOBAL g);
+	my_bool WriteValue(PGLOBAL g, PJVAL jvalp);
 	char   *Locate(PGLOBAL g, PJSON jsp, PJVAL jvp, int k = 1);
 	char   *LocateAll(PGLOBAL g, PJSON jsp, PJVAL jvp, int mx = 10);
 
@@ -211,6 +253,7 @@ protected:
 	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);
 	my_bool LocateArray(PJAR jarp);
 	my_bool LocateObject(PJOB jobp);
 	my_bool LocateValue(PJVAL jvp);
@@ -244,4 +287,6 @@ protected:
 	my_bool  Xpd;                 // True for expandable column
 	my_bool  Parsed;              // True when parsed
 	my_bool  Found;								// Item found by locate
+	my_bool  Wr;			  					// Write mode
+	my_bool  Jb;			  					// Must return json item
 }; // end of class JSNX

storage/connect/mycat.cc

@@ -89,6 +89,7 @@
 #if defined(XML_SUPPORT)
 #include "tabxml.h"
 #endif   // XML_SUPPORT
+#include "mycat.h"
 
 /***********************************************************************/
 /*  Extern static variables.                                           */

storage/connect/mysql-test/connect/std_data/gloss.json

+{
+  "glossary": {
+    "title": "example glossary",
+    "GlossDiv": {
+      "title": "S",
+      "GlossList": {
+        "GlossEntry": {
+          "ID": "SGML",
+          "SortAs": "SGML",
+          "GlossTerm": "Standard Generalized Markup Language",
+          "Acronym": "SGML",
+          "Abbrev": "ISO 8879:1986",
+          "GlossDef": {
+            "para": "A meta-markup language, used to create markup languages such as DocBook.",
+            "GlossSeeAlso": ["GML", "XML"]
+          },
+          "GlossSee": "markup"
+        }
+      }
+    }
+  }
+}

storage/connect/mysql-test/connect/t/json.test

@@ -135,7 +135,7 @@ CREATE TABLE t1
   Year int(4) FIELD_FORMAT='DATEPUB',
   INDEX IX(ISBN)
 )
-ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='bib0.json' LRECL=350 OPTION_LIST='Pretty=0';
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='bib0.json' LRECL=320 OPTION_LIST='Pretty=0';
 SHOW INDEX FROM t1;
 SELECT * FROM t1;
 DESCRIBE SELECT * FROM t1 WHERE ISBN = '9782212090819';

storage/connect/mysql-test/connect/t/json_udf.inc

@@ -9,40 +9,50 @@ if (!$HA_CONNECT_SO) {
   --skip Needs a dynamically built ha_connect.so
 }
 
-CREATE FUNCTION json_array RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_array_add RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_array_add_values RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_array_delete RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_object RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_object_nonull RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_object_add RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_object_delete RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_object_list RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jsonvalue RETURNS STRING SONAME 'ha_connect';
-CREATE AGGREGATE FUNCTION json_array_grp RETURNS STRING SONAME 'ha_connect';
-CREATE AGGREGATE FUNCTION json_object_grp RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_item_merge RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_get_item RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jsonget_string RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jsonget_int RETURNS INTEGER SONAME 'ha_connect';
-CREATE FUNCTION jsonget_real RETURNS REAL SONAME 'ha_connect';
-CREATE FUNCTION jsonlocate RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_locate_all RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_file RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jfile_make RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION json_serialize RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_array RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_array_add_values RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_array_add RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_array_delete RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_object RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_object_nonull RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_object_add RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_object_delete RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_object_list RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_get_item RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_item_merge RETURNS STRING SONAME 'ha_connect';
-CREATE FUNCTION jbin_file RETURNS STRING SONAME 'ha_connect';
+--eval CREATE FUNCTION json_array RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_array_add RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_array_add_values RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_array_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_object RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_object_nonull RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_object_key RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_object_add RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_object_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_object_list RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsonvalue RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE AGGREGATE FUNCTION json_array_grp RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE AGGREGATE FUNCTION json_object_grp RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsonget_string RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsonget_int RETURNS INTEGER SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsonget_real RETURNS REAL SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsonlocate RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_locate_all RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_file RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jfile_make RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsoncontains RETURNS INTEGER SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsoncontains_path RETURNS INTEGER SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_get_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_set_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_insert_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_update_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_item_merge RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_serialize RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_array RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_array_add_values RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_array_add RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_array_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_object RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_object_nonull RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_object_key RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_object_add RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_object_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_object_list RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_get_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_item_merge RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_set_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_insert_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_update_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_file RETURNS STRING SONAME '$HA_CONNECT_SO';
 
 --enable_query_log
 

storage/connect/mysql-test/connect/t/json_udf2.inc

 --disable_query_log
 
-DROP FUNCTION jsonvalue;
 DROP FUNCTION json_array;
 DROP FUNCTION json_array_add;
 DROP FUNCTION json_array_add_values;
 DROP FUNCTION json_array_delete;
 DROP FUNCTION json_object;
 DROP FUNCTION json_object_nonull;
+DROP FUNCTION json_object_key;
 DROP FUNCTION json_object_add;
 DROP FUNCTION json_object_delete;
 DROP FUNCTION json_object_list;
+DROP FUNCTION jsonvalue;
 DROP FUNCTION json_array_grp;
 DROP FUNCTION json_object_grp;
-DROP FUNCTION json_item_merge;
-DROP FUNCTION json_get_item;
-DROP FUNCTION JsonGet_string;
-DROP FUNCTION JsonGet_int;
-DROP FUNCTION JsonGet_real;
+DROP FUNCTION jsonget_string;
+DROP FUNCTION jsonget_int;
+DROP FUNCTION jsonget_real;
 DROP FUNCTION jsonlocate;
 DROP FUNCTION json_locate_all;
 DROP FUNCTION json_file;
-DROP FUNCTION json_serialize;
 DROP FUNCTION jfile_make;
+DROP FUNCTION json_get_item;
+DROP FUNCTION json_item_merge;
+DROP FUNCTION jsoncontains;
+DROP FUNCTION jsoncontains_path;
+DROP FUNCTION json_set_item;
+DROP FUNCTION json_insert_item;
+DROP FUNCTION json_update_item;
+DROP FUNCTION json_serialize;
 DROP FUNCTION jbin_array;
 DROP FUNCTION jbin_array_add_values;
 DROP FUNCTION jbin_array_add;
 DROP FUNCTION jbin_array_delete;
 DROP FUNCTION jbin_object;
 DROP FUNCTION jbin_object_nonull;
+DROP FUNCTION jbin_object_key;
 DROP FUNCTION jbin_object_add;
 DROP FUNCTION jbin_object_delete;
 DROP FUNCTION jbin_object_list;
 DROP FUNCTION jbin_get_item;
 DROP FUNCTION jbin_item_merge;
+DROP FUNCTION jbin_set_item;
+DROP FUNCTION jbin_insert_item;
+DROP FUNCTION jbin_update_item;
 DROP FUNCTION jbin_file;
 
 --enable_query_log

storage/connect/plgdbutl.cpp

@@ -679,7 +679,8 @@ void PlugConvertConstant(PGLOBAL g, void* & value, short& type)
 /*  non quoted blanks are not included in the output format.           */
 /***********************************************************************/
 PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag)
-  {
+{
+	int  rc;
   PDTP pdp = (PDTP)PlugSubAlloc(g, NULL, sizeof(DATPAR));
 
   if (trace)
@@ -708,7 +709,7 @@ PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag)
   pthread_mutex_lock(&parmut);
 #endif  // !__WIN__
 #endif  //  THREAD
-  /*int rc =*/ fmdflex(pdp);
+  rc = fmdflex(pdp);
 #if defined(THREAD)
 #if defined(__WIN__)
   LeaveCriticalSection((LPCRITICAL_SECTION)&parsec);
@@ -718,9 +719,10 @@ PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag)
 #endif  //  THREAD
 
   if (trace)
-    htrc("Done:  in=%s out=%s\n", SVP(pdp->InFmt), SVP(pdp->OutFmt));           
+    htrc("Done: in=%s out=%s rc=%d\n", SVP(pdp->InFmt), SVP(pdp->OutFmt), rc);
+
   return pdp;
-  } // end of MakeDateFormat
+} // end of MakeDateFormat
 
 /***********************************************************************/
 /* Extract the date from a formatted string according to format.       */

storage/connect/tabjson.h

@@ -68,7 +68,8 @@ class JSONDEF : public DOSDEF {                   /* Table description */
 /***********************************************************************/
 class TDBJSN : public TDBDOS {
   friend class JSONCOL;
- public:
+	friend class JSONDEF;
+public:
   // Constructor
    TDBJSN(PJDEF tdp, PTXF txfp);
    TDBJSN(TDBJSN *tdbp);
@@ -90,14 +91,16 @@ class TDBJSN : public TDBDOS {
   virtual int   Cardinality(PGLOBAL g);
   virtual int   GetMaxSize(PGLOBAL g);
   virtual bool  OpenDB(PGLOBAL g);
-  virtual bool  PrepareWriting(PGLOBAL g);
   virtual int   ReadDB(PGLOBAL g);
+	virtual bool  PrepareWriting(PGLOBAL g);
+	virtual int   WriteDB(PGLOBAL g);
 
  protected:
           PJSON FindRow(PGLOBAL g);
           int   MakeTopTree(PGLOBAL g, PJSON jsp);
 
   // Members
+	PGLOBAL G;											 // Support of parse memory
 	PJSON   Top;                     // The top JSON tree
 	PJSON   Row;                     // The current row
 	PJSON   Val;                     // The value of the current row
@@ -154,6 +157,7 @@ class JSONCOL : public DOSCOL {
   JSONCOL(void) {}
 
   // Members
+	PGLOBAL G;										// Support of parse memory
 	TDBJSN *Tjp;                  // To the JSN table block
   PVAL    MulVal;               // To value used by multiple column
   char   *Jpath;                // The json path
@@ -170,6 +174,7 @@ class JSONCOL : public DOSCOL {
 /*  This is the JSON Access Method class declaration.                  */
 /***********************************************************************/
 class TDBJSON : public TDBJSN {
+	friend class JSONDEF;
 	friend class JSONCOL;
  public:
   // Constructor

storage/connect/tabxml.cpp

@@ -60,7 +60,7 @@ extern "C" char version[];
 #endif  // !__WIN__
 
 #define TYPE_UNKNOWN     12        /* Must be greater than other types */
-#define XSTR(M)  sizeof(M) - strlen(M) - 1	       /* To avoid overflow*/
+#define XLEN(M)  sizeof(M) - strlen(M) - 1	       /* To avoid overflow*/
 
 /***********************************************************************/
 /* Class and structure used by XMLColumns.                             */
@@ -226,30 +226,30 @@ PQRYRES XMLColumns(PGLOBAL g, char *db, char *tab, PTOS topt, bool info)
      more:
       if (vp->atp) {
         strncpy(colname, vp->atp->GetName(g), sizeof(colname));
-				strncat(xcol->Name, colname, XSTR(xcol->Name));
+				strncat(xcol->Name, colname, XLEN(xcol->Name));
 
         switch (vp->atp->GetText(g, buf, sizeof(buf))) {
           case RC_INFO:
             PushWarning(g, txmp);
           case RC_OK:
-            strncat(fmt, "@", XSTR(fmt));
+            strncat(fmt, "@", XLEN(fmt));
             break;
           default:
             goto err;
           } // enswitch rc
 
         if (j)
-          strncat(fmt, colname, XSTR(fmt));
+          strncat(fmt, colname, XLEN(fmt));
 
       } else {
         if (tdp->Usedom && node->GetType() != 1)
           continue;
 
         strncpy(colname, node->GetName(g), sizeof(colname));
-				strncat(xcol->Name, colname, XSTR(xcol->Name));
+				strncat(xcol->Name, colname, XLEN(xcol->Name));
 
         if (j)
-          strncat(fmt, colname, XSTR(fmt));
+          strncat(fmt, colname, XLEN(fmt));
 
         if (j < lvl && ok) {
           vp = lvlp[j+1];
@@ -267,9 +267,9 @@ PQRYRES XMLColumns(PGLOBAL g, char *db, char *tab, PTOS topt, bool info)
             if (!vp->atp)
               node = vp->nl->GetItem(g, vp->k++, node);
 
-						strncat(fmt, colname, XSTR(fmt));
-						strncat(fmt, "/", XSTR(fmt));
-						strncat(xcol->Name, "_", XSTR(xcol->Name));
+						strncat(fmt, colname, XLEN(fmt));
+						strncat(fmt, "/", XLEN(fmt));
+						strncat(xcol->Name, "_", XLEN(xcol->Name));
 						j++;
             vp->n = (int)strlen(xcol->Name);
             vp->m = (int)strlen(fmt);

storage/connect/value.cpp

@@ -2440,7 +2440,6 @@ void DTVAL::SetTimeShift(void)
 
   } // end of SetTimeShift
 
-#if defined(connect_EXPORTS)
 // Added by Alexander Barkov
 static void TIME_to_localtime(struct tm *tm, const MYSQL_TIME *ltime)
 {
@@ -2462,9 +2461,6 @@ static struct tm *gmtime_mysql(const time_t *timep, struct tm *tm)
   TIME_to_localtime(tm, &ltime);
   return tm;
 } // end of gmtime_mysql
-#else
-#define gmtime_mysql(T,B)			gmtime((const time_t *)T)
-#endif
 
 /***********************************************************************/
 /*  GetGmTime: returns a pointer to a static tm structure obtained     */
@@ -2493,7 +2489,6 @@ struct tm *DTVAL::GetGmTime(struct tm *tm_buffer)
   return datm;
   } // end of GetGmTime
 
-#if defined(connect_EXPORTS)
 // Added by Alexander Barkov
 static time_t mktime_mysql(struct tm *ptm)
 {
@@ -2504,9 +2499,6 @@ static time_t mktime_mysql(struct tm *ptm)
   time_t t= TIME_to_timestamp(current_thd, &ltime, &error_code);
   return error_code ? (time_t) -1 : t;
 }
-#else
-#define mktime_mysql   mktime
-#endif
 
 /***********************************************************************/
 /*  MakeTime: calculates a date value from a tm structures using the   */