- Major update of the json/bson/mongo table types programs.

  Fix several bugs, chiefly concerning CURL operations.
        modified:   storage/connect/bson.cpp
        modified:   storage/connect/cmgfam.cpp
        modified:   storage/connect/cmgoconn.cpp
        modified:   storage/connect/cmgoconn.h
        modified:   storage/connect/colblk.h
        modified:   storage/connect/ha_connect.cc
        modified:   storage/connect/jmgfam.cpp
        modified:   storage/connect/jmgoconn.cpp
        modified:   storage/connect/jmgoconn.h
        modified:   storage/connect/json.cpp
        modified:   storage/connect/json.h
        modified:   storage/connect/mysql-test/connect/r/bson_mongo_c.result
        modified:   storage/connect/mysql-test/connect/r/json_mongo_c.result
        modified:   storage/connect/mysql-test/connect/r/mongo_c.result
        modified:   storage/connect/mysql-test/connect/r/mongo_java_2.result
        modified:   storage/connect/mysql-test/connect/r/mongo_java_3.result
        modified:   storage/connect/mysql-test/connect/std_data/Mongo2.jar
        modified:   storage/connect/mysql-test/connect/std_data/Mongo3.jar
        modified:   storage/connect/tabbson.cpp
        modified:   storage/connect/tabbson.h
        modified:   storage/connect/tabcmg.cpp
        modified:   storage/connect/tabcmg.h
        modified:   storage/connect/tabjmg.cpp
        modified:   storage/connect/tabjmg.h
        modified:   storage/connect/tabjson.cpp
        modified:   storage/connect/tabjson.h

storage/connect/bson.cpp

@@ -1205,15 +1205,14 @@ void BJSON::SetArrayValue(PBVAL bap, PBVAL nvp, int n)
   int   i = 0;
   PBVAL bvp = NULL;
 
-  if (bap->To_Val)
-    for (bvp = GetArray(bap); bvp; i++, bvp = GetNext(bvp))
-      if (i == n) {
-        SetValueVal(bvp, nvp);
-        return;
-      }
+  for (bvp = GetArray(bap); i < n; i++, bvp = bvp ? GetNext(bvp) : NULL)
+    if (!bvp)
+      AddArrayValue(bap, NewVal());
 
   if (!bvp)
     AddArrayValue(bap, MOF(nvp));
+  else
+    SetValueVal(bvp, nvp);
 
 } // end of SetValue
 

storage/connect/cmgfam.cpp

@@ -56,6 +56,7 @@ CMGFAM::CMGFAM(PJDEF tdp) : DOSFAM((PDOSDEF)NULL)
 		Pcg.Coll_name = tdp->Collname;
 		Pcg.Options = tdp->Options;
 		Pcg.Filter = tdp->Filter;
+		Pcg.Line = NULL;
 		Pcg.Pipe = tdp->Pipe && tdp->Options != NULL;
 		Lrecl = tdp->Lrecl + tdp->Ending;
 	} else {
@@ -64,6 +65,7 @@ CMGFAM::CMGFAM(PJDEF tdp) : DOSFAM((PDOSDEF)NULL)
 		Pcg.Coll_name = NULL;
 		Pcg.Options = NULL;
 		Pcg.Filter = NULL;
+		Pcg.Line = NULL;
 		Pcg.Pipe = false;
 		Lrecl = 0;
 	} // endif tdp
@@ -88,6 +90,7 @@ CMGFAM::CMGFAM(PBDEF tdp) : DOSFAM((PDOSDEF)NULL)
 		Pcg.Coll_name = tdp->Collname;
 		Pcg.Options = tdp->Options;
 		Pcg.Filter = tdp->Filter;
+		Pcg.Line = NULL;
 		Pcg.Pipe = tdp->Pipe && tdp->Options != NULL;
 		Lrecl = tdp->Lrecl + tdp->Ending;
 	} else {
@@ -96,6 +99,7 @@ CMGFAM::CMGFAM(PBDEF tdp) : DOSFAM((PDOSDEF)NULL)
 		Pcg.Coll_name = NULL;
 		Pcg.Options = NULL;
 		Pcg.Filter = NULL;
+		Pcg.Line = NULL;
 		Pcg.Pipe = false;
 		Lrecl = 0;
 	} // endif tdp
@@ -280,6 +284,7 @@ int CMGFAM::ReadBuffer(PGLOBAL g)
 /***********************************************************************/
 int CMGFAM::WriteBuffer(PGLOBAL g)
 {
+	Pcg.Line = Tdbp->GetLine();
 	return Cmgp->Write(g);
 } // end of WriteBuffer