- 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, 18 insertions, 14 deletions

diff --git a/storage/connect/mysql-test/connect/t/jdbc_new.test b/storage/connect/mysql-test/connect/t/jdbc_new.test
index 36e8f36ced0..1eaafdfbf43 100644
--- a/storage/connect/mysql-test/connect/t/jdbc_new.test
+++ b/storage/connect/mysql-test/connect/t/jdbc_new.test
@@ -9,7 +9,8 @@ connection master;
 -- source jdbconn.inc
 
 connection slave;
-SET GLOBAL time_zone='+1:00';
+SET GLOBAL time_zone='+0:00';
+SET time_zone='+0:00';
 
 CREATE TABLE t1 (a int, b char(10));
 INSERT INTO t1 VALUES (NULL,NULL),(0,'test00'),(1,'test01'),(2,'test02'),(3,'test03');
@@ -19,33 +20,34 @@ SELECT * FROM t1;
 --echo # Testing errors
 --echo #
 connection master;
-SET GLOBAL time_zone='+1:00';
+SET GLOBAL time_zone='+0:00';
+SET time_zone='+0:00';
 
 # Bad user name
 # Suppress "mysql_real_connect failed:" (printed in _DEBUG build)
 --replace_result $SLAVE_MYPORT SLAVE_PORT "mysql_real_connect failed: " ""
 --error ER_UNKNOWN_ERROR
 eval CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=unknown';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=unknown&useSSL=false';
 
 # Bad database name
 --replace_result $SLAVE_MYPORT SLAVE_PORT "mysql_real_connect failed: " ""
 --error ER_UNKNOWN_ERROR
 eval CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/unknown?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/unknown?user=root&useSSL=false';
 
 # Bad table name
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 --error ER_UNKNOWN_ERROR
 eval CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC TABNAME='unknown'
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --error ER_NO_SUCH_TABLE
 SHOW CREATE TABLE t1;
 
 # Bad column name
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 (x int, y char(10)) ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 SHOW CREATE TABLE t1;
 --error ER_GET_ERRMSG
@@ -55,7 +57,7 @@ DROP TABLE t1;
 # The remote table disappeared
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 (a int, b char(10)) ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 
 connection slave;
 ALTER TABLE t1 RENAME t1backup;
@@ -77,7 +79,7 @@ DROP TABLE t1;
 # Automatic table structure
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
@@ -86,7 +88,7 @@ DROP TABLE t1;
 # Explicit table structure
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 (a int, b char(10)) ENGINE=CONNECT TABLE_TYPE=JDBC TABNAME='t1'
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
@@ -95,7 +97,7 @@ DROP TABLE t1;
 # Explicit table structure: remote NULL, local NOT NULL
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 (a INT NOT NULL, b CHAR(10) NOT NULL) ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
@@ -104,7 +106,7 @@ DROP TABLE t1;
 # Explicit table structure with wrong column types
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 (a char(10), b int) ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
@@ -125,7 +127,7 @@ INSERT INTO t1 VALUES(100,3333,41235,1234567890,235000000000,3.14159265,3.141592
 connection master;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
@@ -146,7 +148,7 @@ SELECT * FROM t1;
 connection master;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
@@ -167,7 +169,7 @@ SELECT * FROM t1;
 connection master;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=JDBC
-  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root';
+  CONNECTION='jdbc:mysql://127.0.0.1:$SLAVE_MYPORT/test?user=root&useSSL=false';
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
@@ -176,8 +178,10 @@ DROP TABLE t1;
 connection slave;
 DROP TABLE t1;
 SET GLOBAL time_zone=SYSTEM;
+SET time_zone=SYSTEM;
 
 connection master;
 SET GLOBAL time_zone=SYSTEM;
+SET time_zone=SYSTEM;
 -- source jdbconn_cleanup.inc