Skip to content

Commit b291daa

Browse files
BuggynoursBuggynours
committed
- Delete an assert(qrp) from JCATPARM *AllocCatInfo that is called with
 qrp=NULL from JDBConn::SetUUID. Also delete a clone of this function that was duplicated in javaconn.cpp. modified: storage/connect/javaconn.cpp modified: storage/connect/jdbconn.cpp - Update some disabled tests and results to avoid failure modified: storage/connect/mysql-test/connect/r/jdbc.result modified: storage/connect/mysql-test/connect/r/json_java_2.result modified: storage/connect/mysql-test/connect/r/json_java_3.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/t/json_java_2.test modified: storage/connect/mysql-test/connect/t/json_java_3.test modified: storage/connect/mysql-test/connect/t/mongo_java_2.test modified: storage/connect/mysql-test/connect/t/mongo_java_3.test
1 parent 9644415 commit b291daa

File tree

11 files changed

+8
-32
lines changed

11 files changed

+8
-32
lines changed

‎storage/connect/javaconn.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -81,29 +81,6 @@ GETDEF JAVAConn::GetDefaultJavaVMInitArgs = NULL;
8181
#define DEBUG_ONLY(f) ((void)0)
8282
#endif // !_DEBUG
8383

84-
/***********************************************************************/
85-
/* Allocate the structure used to refer to the result set. */
86-
/***********************************************************************/
87-
static JCATPARM *AllocCatInfo(PGLOBAL g, JCATINFO fid, PCSZ db,
88-
PCSZ tab, PQRYRES qrp)
89-
{
90-
JCATPARM *cap;
91-
92-
#if defined(_DEBUG)
93-
assert(qrp);
94-
#endif
95-
96-
if ((cap = (JCATPARM *)PlgDBSubAlloc(g, NULL, sizeof(JCATPARM)))) {
97-
memset(cap, 0, sizeof(JCATPARM));
98-
cap->Id = fid;
99-
cap->Qrp = qrp;
100-
cap->DB = db;
101-
cap->Tab = tab;
102-
} // endif cap
103-
104-
return cap;
105-
} // end of AllocCatInfo
106-
10784
/***********************************************************************/
10885
/* JAVAConn construction/destruction. */
10986
/***********************************************************************/

‎storage/connect/jdbconn.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,6 @@ static JCATPARM *AllocCatInfo(PGLOBAL g, JCATINFO fid, PCSZ db,
322322
{
323323
JCATPARM *cap;
324324

325-
#if defined(_DEBUG)
326-
assert(qrp);
327-
#endif
328-
329325
if ((cap = (JCATPARM *)PlgDBSubAlloc(g, NULL, sizeof(JCATPARM)))) {
330326
memset(cap, 0, sizeof(JCATPARM));
331327
cap->Id = fid;

‎storage/connect/mysql-test/connect/r/jdbc.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ WHEELFOR SALESMAN 10030.00
236236
MARTIN ENGINEER 10000.00
237237
DROP TABLE t1, connect.emp;
238238
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';
239-
SELECT * FROM t2 WHERE command='drop table tx1';
240239
command number message
241240
drop table tx1 0 Execute: java.sql.SQLSyntaxErrorException: (conn:24) Unknown table 'connect.tx1'
242241
SELECT * FROM t2 WHERE command = 'create table tx1 (a int not null, b char(32), c double(8,2))';

‎storage/connect/mysql-test/connect/r/json_java_2.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar';
21
set connect_enable_mongo=1;
32
#
43
# Test the MONGO table type

‎storage/connect/mysql-test/connect/r/json_java_3.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar';
21
set connect_enable_mongo=1;
32
#
43
# Test the MONGO table type

‎storage/connect/mysql-test/connect/r/mongo_java_2.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo2.jar';
21
set connect_enable_mongo=1;
32
#
43
# Test the MONGO table type

‎storage/connect/mysql-test/connect/r/mongo_java_3.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/Mongo3.jar';
21
set connect_enable_mongo=1;
32
#
43
# Test the MONGO table type

‎storage/connect/mysql-test/connect/t/json_java_2.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
-- source jdbconn.inc
22
-- source mongo.inc
33

4+
--disable_query_log
45
eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo2.jar';
6+
--enable_query_log
57
let $DRV= Java;
68
let $VERS= 2;
79
let $TYPE= JSON;

‎storage/connect/mysql-test/connect/t/json_java_3.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
-- source jdbconn.inc
22
-- source mongo.inc
33

4+
--disable_query_log
45
eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo3.jar';
6+
--enable_query_log
57
let $DRV= Java;
68
let $VERS= 3;
79
let $TYPE= JSON;

‎storage/connect/mysql-test/connect/t/mongo_java_2.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
-- source jdbconn.inc
22
-- source mongo.inc
33

4+
--disable_query_log
45
eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo2.jar';
6+
--enable_query_log
57
let $DRV= Java;
68
let $VERS= 2;
79
let $TYPE= MONGO;

0 commit comments

Comments
 (0)