- Fix MDEV-25863 : Replace __WIN__ by _WIN32

  modified:   storage/connect/array.cpp
  modified:   storage/connect/blkfil.cpp
  modified:   storage/connect/block.h
  modified:   storage/connect/bson.cpp
  modified:   storage/connect/cmgoconn.cpp
  modified:   storage/connect/colblk.cpp
  modified:   storage/connect/domdoc.cpp
  modified:   storage/connect/filamap.cpp
  modified:   storage/connect/filamdbf.cpp
  modified:   storage/connect/filamfix.cpp
  modified:   storage/connect/filamgz.cpp
  modified:   storage/connect/filamtxt.cpp
  modified:   storage/connect/filamvct.cpp
  modified:   storage/connect/filamzip.cpp
  modified:   storage/connect/filter.cpp
  modified:   storage/connect/filter.h
  modified:   storage/connect/fmdlex.c
  modified:   storage/connect/global.h
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/javaconn.cpp
  modified:   storage/connect/javaconn.h
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jmgfam.cpp
  modified:   storage/connect/json.cpp
  modified:   storage/connect/macutil.cpp
  modified:   storage/connect/macutil.h
  modified:   storage/connect/maputil.cpp
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/myconn.h
  modified:   storage/connect/myutil.cpp
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/odbconn.h
  modified:   storage/connect/os.h
  modified:   storage/connect/osutil.c
  modified:   storage/connect/plgdbsem.h
  modified:   storage/connect/plgdbutl.cpp
  modified:   storage/connect/plugutil.cpp
  modified:   storage/connect/rcmsg.c
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/reldef.h
  modified:   storage/connect/tabdos.cpp
  modified:   storage/connect/tabext.cpp
  modified:   storage/connect/tabfix.cpp
  modified:   storage/connect/tabfmt.cpp
  modified:   storage/connect/tabjdbc.cpp
  modified:   storage/connect/tabmac.cpp
  modified:   storage/connect/tabmac.h
  modified:   storage/connect/tabmul.cpp
  modified:   storage/connect/tabmul.h
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/taboccur.cpp
  modified:   storage/connect/tabodbc.cpp
  modified:   storage/connect/tabpivot.cpp
  modified:   storage/connect/tabrest.cpp
  modified:   storage/connect/tabrest.h
  modified:   storage/connect/tabsys.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabutil.cpp
  modified:   storage/connect/tabvct.cpp
  modified:   storage/connect/tabwmi.cpp
  modified:   storage/connect/tabxcl.cpp
  modified:   storage/connect/tabxml.cpp
  modified:   storage/connect/valblk.cpp
  modified:   storage/connect/value.cpp
  modified:   storage/connect/xindex.cpp
  modified:   storage/connect/xindex.h

- Fix Date errors and SSL warnings
  modified:   storage/connect/mysql-test/connect/r/jdbc.result
  modified:   storage/connect/mysql-test/connect/r/jdbc_new.result
  modified:   storage/connect/mysql-test/connect/t/jdbc.test
  modified:   storage/connect/mysql-test/connect/t/jdbc_new.test

- Update java source files
  modified:   storage/connect/Mongo2Interface.java
  modified:   storage/connect/Mongo3Interface.java
  added:      storage/connect/Client2.java
  added:      storage/connect/Client3.java
  added:      storage/connect/TestInsert2.java
  added:      storage/connect/TestInsert3.java

1 files changed, 131 insertions, 0 deletions

diff --git a/storage/connect/TestInsert2.java b/storage/connect/TestInsert2.java
new file mode 100644
index 00000000000..e1a7cb4f98b
--- /dev/null
+++ b/storage/connect/TestInsert2.java
@@ -0,0 +1,131 @@
+package wrappers;
+
+import java.io.BufferedReader;
+import java.io.Console;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Date;
+
+public class TestInsert2 {
+	static boolean DEBUG = true;
+	static final Console c = System.console();
+	static Mongo2Interface jdi = null;
+
+	public static void main(String[] args) {
+		int rc;
+		String[] parms = new String[4];
+
+		jdi = new Mongo2Interface(DEBUG);
+
+		parms[0] = getLine("URI: ", false);
+		parms[1] = getLine("Database: ", false);
+		parms[2] = null;
+		parms[3] = null;
+
+		if (parms[0] == null)
+			parms[0] = "mongodb://localhost:27017";
+
+		if (parms[1] == null)
+			parms[1] = "test";
+
+		rc = jdi.MongoConnect(parms);
+
+		if (rc == 0) {
+			Object bdoc = jdi.MakeDocument();
+
+			if (jdi.DocAdd(bdoc, "_id", (Object) 1, 0))
+				System.out.println(jdi.GetErrmsg());
+
+			if (jdi.DocAdd(bdoc, "Name", (Object) "Smith", 0))
+				System.out.println(jdi.GetErrmsg());
+
+			if (jdi.DocAdd(bdoc, "Age", (Object) 39, 0))
+				System.out.println(jdi.GetErrmsg());
+
+			if (jdi.DocAdd(bdoc, "Pi", (Object) 3.14, 0))
+				System.out.println(jdi.GetErrmsg());
+
+			if (jdi.DocAdd(bdoc, "Phone", (Object) "{\"ext\":[4,5,7]}", 1))
+				System.out.println(jdi.GetErrmsg());
+
+			if (jdi.DocAdd(bdoc, "Scores", (Object) "[24,2,13]", 2))
+				System.out.println(jdi.GetErrmsg());
+
+			Object bar = jdi.MakeArray();
+
+			for (int i = 1; i < 3; i++)
+				if (jdi.ArrayAdd(bar, i, (Object) (Math.random() * 10.0), 0))
+					System.out.println(jdi.GetErrmsg());
+
+			if (jdi.DocAdd(bdoc, "Prices", bar, 0))
+				System.out.println(jdi.GetErrmsg());
+
+			Object dat = new Date();
+
+			if (jdi.DocAdd(bdoc, "Date", dat, 0))
+				System.out.println(jdi.GetErrmsg());
+
+			System.out.println(bdoc);
+
+			// Try to update
+			if (!jdi.GetCollection("updtest") && !jdi.FindColl(null, null)) {
+				if (jdi.CollDelete(true) < 0)
+					System.out.println(jdi.GetErrmsg());
+
+				if (jdi.CollInsert(bdoc))
+					System.out.println(jdi.GetErrmsg());
+
+				Object updlist = jdi.MakeDocument();
+
+				if (jdi.DocAdd(updlist, "Age", (Object) 45, 0))
+					System.out.println(jdi.GetErrmsg());
+
+				Object upd = jdi.MakeDocument();
+
+				if (jdi.DocAdd(upd, "$set", updlist, 0))
+					System.out.println(jdi.GetErrmsg());
+
+				if (jdi.ReadNext() > 0 && jdi.CollUpdate(upd) < 0)
+					System.out.println(jdi.GetErrmsg());
+
+				if (!jdi.Rewind() && jdi.ReadNext() > 0)
+					System.out.println(jdi.GetDoc());
+				else
+					System.out.println("Failed Rewind");
+
+			} // endif n
+
+		} // endif rc
+
+	} // end of main
+
+	// ==================================================================
+	private static String getLine(String p, boolean b) {
+		String response;
+
+		if (c != null) {
+			// Standard console mode
+			if (b) {
+				response = new String(c.readPassword(p));
+			} else
+				response = c.readLine(p);
+
+		} else {
+			// For instance when testing from Eclipse
+			BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+
+			System.out.print(p);
+
+			try {
+				// Cannot suppress echo for password entry
+				response = in.readLine();
+			} catch (IOException e) {
+				response = "";
+			} // end of try/catch
+
+		} // endif c
+
+		return (response.isEmpty()) ? null : response;
+	} // end of getLine
+
+}