Update tests to cope with changes

13 files changed, 17 insertions, 8 deletions

diff --git a/storage/connect/mysql-test/connect/r/json_java_2.result b/storage/connect/mysql-test/connect/r/json_java_2.result
index 2ce89f971b2..bc6ad16772e 100644
--- 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,5 @@
 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #
diff --git a/storage/connect/mysql-test/connect/r/json_java_3.result b/storage/connect/mysql-test/connect/r/json_java_3.result
index d914b507f52..e7dd9468845 100644
--- 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,5 @@
 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #
diff --git a/storage/connect/mysql-test/connect/r/json_mongo_c.result b/storage/connect/mysql-test/connect/r/json_mongo_c.result
index 454743e679b..7d26e0152f2 100644
--- a/storage/connect/mysql-test/connect/r/json_mongo_c.result
+++ b/storage/connect/mysql-test/connect/r/json_mongo_c.result
@@ -1,4 +1,5 @@
 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #
diff --git a/storage/connect/mysql-test/connect/r/mongo_c.result b/storage/connect/mysql-test/connect/r/mongo_c.result
index cabdf713d16..8b86ce32943 100644
--- a/storage/connect/mysql-test/connect/r/mongo_c.result
+++ b/storage/connect/mysql-test/connect/r/mongo_c.result
@@ -1,4 +1,5 @@
 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #
diff --git a/storage/connect/mysql-test/connect/r/mongo_java_2.result b/storage/connect/mysql-test/connect/r/mongo_java_2.result
index 890b88324bb..cccda2760d6 100644
--- 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,5 @@
 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #
diff --git a/storage/connect/mysql-test/connect/r/mongo_java_3.result b/storage/connect/mysql-test/connect/r/mongo_java_3.result
index f6f9895a29e..ae39148a156 100644
--- 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,5 @@
 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 #
 # Test the MONGO table type
 #
diff --git a/storage/connect/mysql-test/connect/r/xml2_zip.result b/storage/connect/mysql-test/connect/r/xml2_zip.result
index 7d67a3d5498..e743af32418 100644
--- a/storage/connect/mysql-test/connect/r/xml2_zip.result
+++ b/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
diff --git a/storage/connect/mysql-test/connect/r/xml_zip.result b/storage/connect/mysql-test/connect/r/xml_zip.result
index ddde0fa8a35..5f17249b390 100644
--- a/storage/connect/mysql-test/connect/r/xml_zip.result
+++ b/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
diff --git a/storage/connect/mysql-test/connect/t/json_java_2.test b/storage/connect/mysql-test/connect/t/json_java_2.test
index 2f64d8e2eed..03202828bb1 100644
--- a/storage/connect/mysql-test/connect/t/json_java_2.test
+++ b/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;
diff --git a/storage/connect/mysql-test/connect/t/json_java_3.test b/storage/connect/mysql-test/connect/t/json_java_3.test
index cee8343772a..238808a833f 100644
--- a/storage/connect/mysql-test/connect/t/json_java_3.test
+++ b/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;
diff --git a/storage/connect/mysql-test/connect/t/mongo_test.inc b/storage/connect/mysql-test/connect/t/mongo_test.inc
index 1c8bf07184f..0a9c80f5ba5 100644
--- a/storage/connect/mysql-test/connect/t/mongo_test.inc
+++ b/storage/connect/mysql-test/connect/t/mongo_test.inc
@@ -1,4 +1,5 @@
 set connect_enable_mongo=1;
+set connect_json_all_path=0;
 
 --echo #
 --echo # Test the MONGO table type
diff --git a/storage/connect/mysql-test/connect/t/xml2_zip.test b/storage/connect/mysql-test/connect/t/xml2_zip.test
index 46697dc97f7..df69f9dace3 100644
--- a/storage/connect/mysql-test/connect/t/xml2_zip.test
+++ b/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;
 
diff --git a/storage/connect/mysql-test/connect/t/xml_zip.test b/storage/connect/mysql-test/connect/t/xml_zip.test
index 774021485f9..29ee2e0e607 100644
--- a/storage/connect/mysql-test/connect/t/xml_zip.test
+++ b/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;