Update tests to cope with changes

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

 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #

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

 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #

storage/connect/mysql-test/connect/r/json_mongo_c.result

 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #

storage/connect/mysql-test/connect/r/mongo_c.result

 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #

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

 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #

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

 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #

storage/connect/mysql-test/connect/r/xml2_zip.result

@@ -17,7 +17,7 @@ PUBLISHER_NAME CHAR(15) NOT NULL XPATH='PUBLISHER/NAME',
 PUBLISHER_PLACE CHAR(5) NOT NULL XPATH='PUBLISHER/PLACE',
 DATEPUB CHAR(4) NOT NULL
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample2.zip' ZIPPED=YES
-OPTION_LIST='entry=xsample2.xml,load=xsample2.xml,rownode=BOOK,xmlsup=libxml2,expand=1,mulnode=AUTHOR';
+OPTION_LIST='depth=0,entry=xsample2.xml,load=xsample2.xml,rownode=BOOK,xmlsup=libxml2,expand=1,mulnode=AUTHOR';
 SELECT * FROM t1;
 ISBN	9782212090819
 LANG	fr
@@ -69,7 +69,7 @@ PUBLISHER_PLACE	Paris
 DATEPUB	2003
 CREATE TABLE t2
 ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample2.zip' ZIPPED=YES
-OPTION_LIST='xmlsup=libxml2';
+OPTION_LIST='depth=0,xmlsup=libxml2';
 SELECT * FROM t2;
 ISBN	9782212090819
 LANG	fr

storage/connect/mysql-test/connect/r/xml_zip.result

@@ -15,7 +15,7 @@ PUBLISHER_NAME CHAR(15) NOT NULL XPATH='PUBLISHER/NAME',
 PUBLISHER_PLACE CHAR(5) NOT NULL XPATH='PUBLISHER/PLACE',
 DATEPUB CHAR(4) NOT NULL
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample2.zip' ZIPPED=YES
-OPTION_LIST='entry=xsample2.xml,load=xsample2.xml,rownode=BOOK,xmlsup=domdoc,expand=1,mulnode=AUTHOR';
+OPTION_LIST='depth=0,entry=xsample2.xml,load=xsample2.xml,rownode=BOOK,xmlsup=domdoc,expand=1,mulnode=AUTHOR';
 SELECT * FROM t1;
 ISBN	9782212090819
 LANG	fr
@@ -67,7 +67,7 @@ PUBLISHER_PLACE	Paris
 DATEPUB	2003
 CREATE TABLE t2
 ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample2.zip' ZIPPED=YES
-OPTION_LIST='xmlsup=domdoc';
+OPTION_LIST='depth=0,xmlsup=domdoc';
 SELECT * FROM t2;
 ISBN	9782212090819
 LANG	fr

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

@@ -3,6 +3,7 @@
 
 --disable_query_log
 eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo2.jar';
+set connect_json_all_path=0;
 --enable_query_log
 let $DRV= Java;
 let $VERS= 2;

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

@@ -3,6 +3,7 @@
 
 --disable_query_log
 eval SET GLOBAL connect_class_path='$MTR_SUITE_DIR/std_data/Mongo3.jar';
+set connect_json_all_path=0;
 --enable_query_log
 let $DRV= Java;
 let $VERS= 3;

storage/connect/mysql-test/connect/t/mongo_test.inc

 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 
 --echo #
 --echo # Test the MONGO table type

storage/connect/mysql-test/connect/t/xml2_zip.test

@@ -24,13 +24,13 @@ PUBLISHER_NAME CHAR(15) NOT NULL XPATH='PUBLISHER/NAME',
 PUBLISHER_PLACE CHAR(5) NOT NULL XPATH='PUBLISHER/PLACE',
 DATEPUB CHAR(4) NOT NULL
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample2.zip' ZIPPED=YES
-OPTION_LIST='entry=xsample2.xml,load=xsample2.xml,rownode=BOOK,xmlsup=libxml2,expand=1,mulnode=AUTHOR';
+OPTION_LIST='depth=0,entry=xsample2.xml,load=xsample2.xml,rownode=BOOK,xmlsup=libxml2,expand=1,mulnode=AUTHOR';
 SELECT * FROM t1;
 
 #testing discovery
 CREATE TABLE t2
 ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample2.zip' ZIPPED=YES
-OPTION_LIST='xmlsup=libxml2';
+OPTION_LIST='depth=0,xmlsup=libxml2';
 SELECT * FROM t2;
 DROP TABLE t1,t2;
 

storage/connect/mysql-test/connect/t/xml_zip.test

@@ -24,13 +24,13 @@ PUBLISHER_NAME CHAR(15) NOT NULL XPATH='PUBLISHER/NAME',
 PUBLISHER_PLACE CHAR(5) NOT NULL XPATH='PUBLISHER/PLACE',
 DATEPUB CHAR(4) NOT NULL
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample2.zip' ZIPPED=YES
-OPTION_LIST='entry=xsample2.xml,load=xsample2.xml,rownode=BOOK,xmlsup=domdoc,expand=1,mulnode=AUTHOR';
+OPTION_LIST='depth=0,entry=xsample2.xml,load=xsample2.xml,rownode=BOOK,xmlsup=domdoc,expand=1,mulnode=AUTHOR';
 SELECT * FROM t1;
 
 #testing discovery
 CREATE TABLE t2
 ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample2.zip' ZIPPED=YES
-OPTION_LIST='xmlsup=domdoc';
+OPTION_LIST='depth=0,xmlsup=domdoc';
 SELECT * FROM t2;
 DROP TABLE t1,t2;