Merge remote-tracking branch 'connect/10.2' into 10.2

2018-09-13 10:09:28 +02:00 · 2018-09-13 10:09:28 +02:00 · 2b46dca5d7
commit 2b46dca5d7
parent a93363022c dbf25197c1
13 changed files with 26 additions and 81 deletions
--- a/storage/connect/javaconn.cpp
+++ b/storage/connect/javaconn.cpp
@ -81,29 +81,6 @@ GETDEF JAVAConn::GetDefaultJavaVMInitArgs = NULL;
 #define DEBUG_ONLY(f)      ((void)0)
 #endif  // !_DEBUG

-/***********************************************************************/
-/*  Allocate the structure used to refer to the result set.            */
-/***********************************************************************/
-static JCATPARM *AllocCatInfo(PGLOBAL g, JCATINFO fid, PCSZ db,
-	PCSZ tab, PQRYRES qrp)
-{
-	JCATPARM *cap;
-
-#if defined(_DEBUG)
-	assert(qrp);
-#endif
-
-	if ((cap = (JCATPARM *)PlgDBSubAlloc(g, NULL, sizeof(JCATPARM)))) {
-		memset(cap, 0, sizeof(JCATPARM));
-		cap->Id = fid;
-		cap->Qrp = qrp;
-		cap->DB = db;
-		cap->Tab = tab;
-	} // endif cap
-
-	return cap;
-} // end of AllocCatInfo
-
 /***********************************************************************/
 /*  JAVAConn construction/destruction.                                 */
 /***********************************************************************/
--- a/storage/connect/jdbconn.cpp
+++ b/storage/connect/jdbconn.cpp
@ -322,10 +322,6 @@ static JCATPARM *AllocCatInfo(PGLOBAL g, JCATINFO fid, PCSZ db,
 {
 	JCATPARM *cap;

-#if defined(_DEBUG)
-	assert(qrp);
-#endif
-
 	if ((cap = (JCATPARM *)PlgDBSubAlloc(g, NULL, sizeof(JCATPARM)))) {
 		memset(cap, 0, sizeof(JCATPARM));
 		cap->Id = fid;
--- a/storage/connect/mysql-test/connect/r/jdbc.result
+++ b/storage/connect/mysql-test/connect/r/jdbc.result
@ -236,7 +236,6 @@ WHEELFOR	SALESMAN	10030.00
 MARTIN	ENGINEER	10000.00
 DROP TABLE t1, connect.emp;
 CREATE TABLE t2 (command varchar(128) not null,number int(5) not null flag=1,message varchar(255) flag=2) ENGINE=CONNECT TABLE_TYPE=JDBC CONNECTION='jdbc:mariadb://localhost:PORT/connect' OPTION_LIST='User=root,Execsrc=1';
-SELECT * FROM t2 WHERE command='drop table tx1';
 command	number	message
 drop table tx1	0	Execute: java.sql.SQLSyntaxErrorException: (conn:24) Unknown table 'connect.tx1'
 SELECT * FROM t2 WHERE command = 'create table tx1 (a int not null, b char(32), c double(8,2))';
--- a/storage/connect/mysql-test/connect/r/json_java_2.result
+++ b/storage/connect/mysql-test/connect/r/json_java_2.result
@ -1,4 +1,3 @@
-SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar';
 set connect_enable_mongo=1;
 #
 # Test the MONGO table type
--- a/storage/connect/mysql-test/connect/r/json_java_3.result
+++ b/storage/connect/mysql-test/connect/r/json_java_3.result
@ -1,4 +1,3 @@
-SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar';
 set connect_enable_mongo=1;
 #
 # Test the MONGO table type
--- a/storage/connect/mysql-test/connect/r/mongo_java_2.result
+++ b/storage/connect/mysql-test/connect/r/mongo_java_2.result
@ -1,4 +1,3 @@
-SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar';
 set connect_enable_mongo=1;
 #
 # Test the MONGO table type
--- a/storage/connect/mysql-test/connect/r/mongo_java_3.result
+++ b/storage/connect/mysql-test/connect/r/mongo_java_3.result
@ -1,4 +1,3 @@
-SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar';
 set connect_enable_mongo=1;
 #
 # Test the MONGO table type
--- a/storage/connect/mysql-test/connect/r/xml2.result
+++ b/storage/connect/mysql-test/connect/r/xml2.result
@ -333,37 +333,6 @@ DROP TABLE t1;
 #
 # Testing Cyrillic
 #
-CREATE TABLE t1
-(
-c CHAR(16) CHARACTER SET utf8
-) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='cp1251.xml'
-  OPTION_LIST='xmlsup=libxml2,rownode=b';
-SELECT * FROM t1;
-c	БВГДЕЖЗ
-INSERT INTO t1 VALUES ('ИКЛМН');
-SELECT c, HEX(c) FROM t1;
-c	БВГДЕЖЗ
-HEX(c)	D091D092D093D094D095D096D097
-c	ИКЛМН
-HEX(c)	D098D09AD09BD09CD09D
-DROP TABLE t1;
-CREATE TABLE t1
-(
-c CHAR(16) CHARACTER SET cp1251
-) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='cp1251.xml'
-  OPTION_LIST='xmlsup=libxml2,rownode=b';
-SELECT * FROM t1;
-c	БВГДЕЖЗ
-c	ИКЛМН
-INSERT INTO t1 VALUES ('ОПРСТ');
-SELECT c, HEX(c) FROM t1;
-c	БВГДЕЖЗ
-HEX(c)	C1C2C3C4C5C6C7
-c	ИКЛМН
-HEX(c)	C8CACBCCCD
-c	ОПРСТ
-HEX(c)	CECFD0D1D2
-DROP TABLE t1;
 #
 # Testing that the underlying file is created with a proper Encoding
 #
--- a/storage/connect/mysql-test/connect/t/json_java_2.test
+++ b/storage/connect/mysql-test/connect/t/json_java_2.test
@ -1,7 +1,9 @@
 -- source jdbconn.inc
 -- source mongo.inc

+--disable_query_log
 eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo2.jar';
+--enable_query_log
 let $DRV= Java;
 let $VERS= 2;
 let $TYPE= JSON;
--- a/storage/connect/mysql-test/connect/t/json_java_3.test
+++ b/storage/connect/mysql-test/connect/t/json_java_3.test
@ -1,7 +1,9 @@
 -- source jdbconn.inc
 -- source mongo.inc

+--disable_query_log
 eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo3.jar';
+--enable_query_log
 let $DRV= Java;
 let $VERS= 3;
 let $TYPE= JSON;
--- a/storage/connect/mysql-test/connect/t/mongo_java_2.test
+++ b/storage/connect/mysql-test/connect/t/mongo_java_2.test
@ -1,7 +1,9 @@
 -- source jdbconn.inc
 -- source mongo.inc

+--disable_query_log
 eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo2.jar';
+--enable_query_log
 let $DRV= Java;
 let $VERS= 2;
 let $TYPE= MONGO;
--- a/storage/connect/mysql-test/connect/t/mongo_java_3.test
+++ b/storage/connect/mysql-test/connect/t/mongo_java_3.test
@ -1,7 +1,9 @@
 -- source jdbconn.inc
 -- source mongo.inc

+--disable_query_log
 eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo3.jar';
+--enable_query_log
 let $DRV= Java;
 let $VERS= 3;
 let $TYPE= MONGO;
--- a/storage/connect/mysql-test/connect/t/xml2.test
+++ b/storage/connect/mysql-test/connect/t/xml2.test
@ -240,24 +240,24 @@ DROP TABLE t1;
 --echo #
 --echo # Testing Cyrillic
 --echo #
-CREATE TABLE t1
-(
-  c CHAR(16) CHARACTER SET utf8
-) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='cp1251.xml'
-  OPTION_LIST='xmlsup=libxml2,rownode=b';
-SELECT * FROM t1;
-INSERT INTO t1 VALUES ('ИКЛМН');
-SELECT c, HEX(c) FROM t1;
-DROP TABLE t1;
-CREATE TABLE t1
-(
-  c CHAR(16) CHARACTER SET cp1251
-) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='cp1251.xml'
-  OPTION_LIST='xmlsup=libxml2,rownode=b';
-SELECT * FROM t1;
-INSERT INTO t1 VALUES ('ОПРСТ');
-SELECT c, HEX(c) FROM t1;
-DROP TABLE t1;
+#CREATE TABLE t1
+#(
+#  c CHAR(16) CHARACTER SET utf8
+#) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='cp1251.xml'
+#  OPTION_LIST='xmlsup=libxml2,rownode=b';
+#SELECT * FROM t1;
+#INSERT INTO t1 VALUES ('ИКЛМН');
+#SELECT c, HEX(c) FROM t1;
+#DROP TABLE t1;
+#CREATE TABLE t1
+#(
+#  c CHAR(16) CHARACTER SET cp1251
+#) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='cp1251.xml'
+#  OPTION_LIST='xmlsup=libxml2,rownode=b';
+#SELECT * FROM t1;
+#INSERT INTO t1 VALUES ('ОПРСТ');
+#SELECT c, HEX(c) FROM t1;
+#DROP TABLE t1;


 --echo #