hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject [6/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)
Date Thu, 03 Dec 2015 21:43:07 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
index 8b7535d..a2b0bbe 100644
--- a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
+++ b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');
 load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketmapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin1.q b/ql/src/test/queries/clientpositive/bucketmapjoin1.q
index 204e759..2fd3804 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin1.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
 
 CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketmapjoin13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin13.q b/ql/src/test/queries/clientpositive/bucketmapjoin13.q
index fd2f22a..c8f01f7 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin13.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin13.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max=1;
 
 CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketmapjoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin2.q b/ql/src/test/queries/clientpositive/bucketmapjoin2.q
index 108b67a..d14261f 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin2.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
 load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketmapjoin5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin5.q b/ql/src/test/queries/clientpositive/bucketmapjoin5.q
index 72cffc2..6c03bbb 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin5.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin;
 load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketmapjoin_negative2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin_negative2.q b/ql/src/test/queries/clientpositive/bucketmapjoin_negative2.q
index e2c0d8c..36d34dc 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin_negative2.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin_negative2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin;
 load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketpruning1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketpruning1.q b/ql/src/test/queries/clientpositive/bucketpruning1.q
index be403a5..6c689f1 100644
--- a/ql/src/test/queries/clientpositive/bucketpruning1.q
+++ b/ql/src/test/queries/clientpositive/bucketpruning1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.optimize.index.filter=true;
 set hive.tez.bucket.pruning=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
index a66378c..4a14587 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
index 0f1e8c6..a31a451 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
index 6f4becd..e95ba98 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
index a609422..ec0c2dc 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
index b8370c6..45635c1 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
index b34f8d1..d0bbd9a 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cast1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cast1.q b/ql/src/test/queries/clientpositive/cast1.q
index 7f5f8a5..fdf4219 100644
--- a/ql/src/test/queries/clientpositive/cast1.q
+++ b/ql/src/test/queries/clientpositive/cast1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(c1 INT, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 INT, c6 STRING, c7 INT) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_gby.q b/ql/src/test/queries/clientpositive/cbo_gby.q
index 73c8c6a..7aca53a 100644
--- a/ql/src/test/queries/clientpositive/cbo_gby.q
+++ b/ql/src/test/queries/clientpositive/cbo_gby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_gby_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_gby_empty.q b/ql/src/test/queries/clientpositive/cbo_gby_empty.q
index cd264ed..7b23d01 100644
--- a/ql/src/test/queries/clientpositive/cbo_gby_empty.q
+++ b/ql/src/test/queries/clientpositive/cbo_gby_empty.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_join.q b/ql/src/test/queries/clientpositive/cbo_join.q
index 513272f..eef2440 100644
--- a/ql/src/test/queries/clientpositive/cbo_join.q
+++ b/ql/src/test/queries/clientpositive/cbo_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_limit.q b/ql/src/test/queries/clientpositive/cbo_limit.q
index cb349bb..5e54a1b 100644
--- a/ql/src/test/queries/clientpositive/cbo_limit.q
+++ b/ql/src/test/queries/clientpositive/cbo_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_annotate_stats_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_annotate_stats_groupby.q b/ql/src/test/queries/clientpositive/cbo_rp_annotate_stats_groupby.q
index 4d2cac9..3159fc7 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_annotate_stats_groupby.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_annotate_stats_groupby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.stats.fetch.column.stats=true;
 set hive.map.aggr.hash.percentmemory=0.0f;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q b/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q
index f8511b1..e64fd41 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.stats.fetch.column.stats=true;
 set hive.auto.convert.join = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q b/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q
index 7e2f068..f7da842 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q b/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q
index 6c35548..8ab2486 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_gby.q b/ql/src/test/queries/clientpositive/cbo_rp_gby.q
index fe2c96e..67b3e7b 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_gby.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_gby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_gby2_map_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_gby2_map_multi_distinct.q b/ql/src/test/queries/clientpositive/cbo_rp_gby2_map_multi_distinct.q
index 28f1f81..0f18e22 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_gby2_map_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_gby2_map_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q b/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q
index 375129a..48d8cb1 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q b/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q
index ce79928..921b25c 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q
@@ -1,6 +1,6 @@
 set hive.cbo.returnpath.hiveop=true;
 set hive.map.aggr=false;
-
+set hive.mapred.mode=nonstrict;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_join.q b/ql/src/test/queries/clientpositive/cbo_rp_join.q
index 367e67f..0a87306 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_join.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_join0.q b/ql/src/test/queries/clientpositive/cbo_rp_join0.q
index 3e3a013..6543fd8 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_join0.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_join0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_join1.q b/ql/src/test/queries/clientpositive/cbo_rp_join1.q
index ce6abe4..a454d02 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_join1.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_join1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE myinput1(key int, value int);

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_limit.q b/ql/src/test/queries/clientpositive/cbo_rp_limit.q
index 24f8b5b..488280d 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_limit.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q b/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q
index b7fbe29..2de2434 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q b/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q
index 8daf718..c497ce9 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.optimize.ppd=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q b/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q
index 4b376d9..e1eb74d 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q b/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q
index a2ac678..6be2b19 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_stats.q b/ql/src/test/queries/clientpositive/cbo_rp_stats.q
index f8cf329..7674a99 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_stats.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_stats.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q b/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q
index 19c2943..612b392 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q b/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q
index ad2cc67..93de2c9 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_udaf_percentile_approx_23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_udaf_percentile_approx_23.q b/ql/src/test/queries/clientpositive/cbo_rp_udaf_percentile_approx_23.q
index a3cf4a5..0f2d0dd 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_udaf_percentile_approx_23.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_udaf_percentile_approx_23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
 -- 0.23 changed input order of data in reducer task, which affects result of percentile_approx

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_udf_udaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_udf_udaf.q b/ql/src/test/queries/clientpositive/cbo_rp_udf_udaf.q
index c057105..c2aa54e 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_udf_udaf.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_udf_udaf.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_union.q b/ql/src/test/queries/clientpositive/cbo_rp_union.q
index a6915f9..cf2cf40 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_union.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_views.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_views.q b/ql/src/test/queries/clientpositive/cbo_rp_views.q
index b93f8d8..1004303 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_views.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_views.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_windowing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_windowing.q b/ql/src/test/queries/clientpositive/cbo_rp_windowing.q
index 95da904..edd19c9 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_windowing.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_windowing.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q b/ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q
index d02c8be..97f113c 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_semijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_semijoin.q b/ql/src/test/queries/clientpositive/cbo_semijoin.q
index 5e5197b..57db490 100644
--- a/ql/src/test/queries/clientpositive/cbo_semijoin.q
+++ b/ql/src/test/queries/clientpositive/cbo_semijoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_simple_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_simple_select.q b/ql/src/test/queries/clientpositive/cbo_simple_select.q
index 92c0e72..50e57fd 100644
--- a/ql/src/test/queries/clientpositive/cbo_simple_select.q
+++ b/ql/src/test/queries/clientpositive/cbo_simple_select.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_stats.q b/ql/src/test/queries/clientpositive/cbo_stats.q
index 8f28c37..fdc9119 100644
--- a/ql/src/test/queries/clientpositive/cbo_stats.q
+++ b/ql/src/test/queries/clientpositive/cbo_stats.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_subq_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_subq_in.q b/ql/src/test/queries/clientpositive/cbo_subq_in.q
index 0a25b9c..4cbee19 100644
--- a/ql/src/test/queries/clientpositive/cbo_subq_in.q
+++ b/ql/src/test/queries/clientpositive/cbo_subq_in.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_subq_not_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_subq_not_in.q b/ql/src/test/queries/clientpositive/cbo_subq_not_in.q
index 735eff4..8e78225 100644
--- a/ql/src/test/queries/clientpositive/cbo_subq_not_in.q
+++ b/ql/src/test/queries/clientpositive/cbo_subq_not_in.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_udf_max.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_udf_max.q b/ql/src/test/queries/clientpositive/cbo_udf_max.q
index c22e89b..b5fdba7 100644
--- a/ql/src/test/queries/clientpositive/cbo_udf_max.q
+++ b/ql/src/test/queries/clientpositive/cbo_udf_max.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 
 DESCRIBE FUNCTION max;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_udf_udaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_udf_udaf.q b/ql/src/test/queries/clientpositive/cbo_udf_udaf.q
index 16d9bb9..34d5985 100644
--- a/ql/src/test/queries/clientpositive/cbo_udf_udaf.q
+++ b/ql/src/test/queries/clientpositive/cbo_udf_udaf.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_union.q b/ql/src/test/queries/clientpositive/cbo_union.q
index 312d7be..42d28e1 100644
--- a/ql/src/test/queries/clientpositive/cbo_union.q
+++ b/ql/src/test/queries/clientpositive/cbo_union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_views.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_views.q b/ql/src/test/queries/clientpositive/cbo_views.q
index 1867d2a..8a563cf 100644
--- a/ql/src/test/queries/clientpositive/cbo_views.q
+++ b/ql/src/test/queries/clientpositive/cbo_views.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cbo_windowing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_windowing.q b/ql/src/test/queries/clientpositive/cbo_windowing.q
index 030deb0..4fb0351 100644
--- a/ql/src/test/queries/clientpositive/cbo_windowing.q
+++ b/ql/src/test/queries/clientpositive/cbo_windowing.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/column_access_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/column_access_stats.q b/ql/src/test/queries/clientpositive/column_access_stats.q
index d559e7d..b981ee4 100644
--- a/ql/src/test/queries/clientpositive/column_access_stats.q
+++ b/ql/src/test/queries/clientpositive/column_access_stats.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.CheckColumnAccessHook;
 SET hive.stats.collect.scancols=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/columnstats_part_coltype.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/columnstats_part_coltype.q b/ql/src/test/queries/clientpositive/columnstats_part_coltype.q
index ac4c370..472d227 100644
--- a/ql/src/test/queries/clientpositive/columnstats_part_coltype.q
+++ b/ql/src/test/queries/clientpositive/columnstats_part_coltype.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Test type date, int, and string in partition column
 drop table if exists partcolstats;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/columnstats_partlvl.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/columnstats_partlvl.q b/ql/src/test/queries/clientpositive/columnstats_partlvl.q
index 0947a83..2c92dfe 100644
--- a/ql/src/test/queries/clientpositive/columnstats_partlvl.q
+++ b/ql/src/test/queries/clientpositive/columnstats_partlvl.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 DROP TABLE Employee_Part;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/columnstats_partlvl_dp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/columnstats_partlvl_dp.q b/ql/src/test/queries/clientpositive/columnstats_partlvl_dp.q
index 53b691c..ead9a2d 100644
--- a/ql/src/test/queries/clientpositive/columnstats_partlvl_dp.q
+++ b/ql/src/test/queries/clientpositive/columnstats_partlvl_dp.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE Employee_Part;
 
 CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/combine2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/combine2.q b/ql/src/test/queries/clientpositive/combine2.q
index 376c37c..851b7e1 100644
--- a/ql/src/test/queries/clientpositive/combine2.q
+++ b/ql/src/test/queries/clientpositive/combine2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 USE default;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/complex_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/complex_alias.q b/ql/src/test/queries/clientpositive/complex_alias.q
index e2810c3..d506a34 100644
--- a/ql/src/test/queries/clientpositive/complex_alias.q
+++ b/ql/src/test/queries/clientpositive/complex_alias.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE agg1 (col0 INT, col1 STRING, col2 DOUBLE);
 
 INSERT INTO TABLE agg1 select key,value,key from src tablesample (1 rows);

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q b/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
index 08855cb..cc6c46a 100644
--- a/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
+++ b/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 explain extended

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/constprog2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog2.q b/ql/src/test/queries/clientpositive/constprog2.q
index 6001668..ccbb8c1 100644
--- a/ql/src/test/queries/clientpositive/constprog2.q
+++ b/ql/src/test/queries/clientpositive/constprog2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 set hive.optimize.constant.propagation=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/constprog_dpp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog_dpp.q b/ql/src/test/queries/clientpositive/constprog_dpp.q
index db4ca5f..fff1c9e 100644
--- a/ql/src/test/queries/clientpositive/constprog_dpp.q
+++ b/ql/src/test/queries/clientpositive/constprog_dpp.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.execution.engine=tez;
 set hive.optimize.constant.propagation=true;
 set hive.tez.dynamic.partition.pruning=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/constprog_partitioner.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog_partitioner.q b/ql/src/test/queries/clientpositive/constprog_partitioner.q
index 7800ffe..baa34f7 100644
--- a/ql/src/test/queries/clientpositive/constprog_partitioner.q
+++ b/ql/src/test/queries/clientpositive/constprog_partitioner.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 set hive.optimize.constant.propagation=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer1.q b/ql/src/test/queries/clientpositive/correlationoptimizer1.q
index 51d2c10..d16904e 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer1.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer10.q b/ql/src/test/queries/clientpositive/correlationoptimizer10.q
index cbd9e22..b8fb9a7 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer10.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;
 -- When Correlation Optimizer is turned off, 4 MR jobs are needed.

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer11.q b/ql/src/test/queries/clientpositive/correlationoptimizer11.q
index 412baa7..4cf53f7 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer11.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 -- Tests in this file are used to make sure Correlation Optimizer
 -- can correctly handle tables with partitions

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer13.q b/ql/src/test/queries/clientpositive/correlationoptimizer13.q
index e979465..f1faf2a 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer13.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING);
 INSERT OVERWRITE TABLE tmp
 SELECT x.key, y.key, x.value, y.value FROM src x JOIN src y ON (x.key = y.key);

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer14.q b/ql/src/test/queries/clientpositive/correlationoptimizer14.q
index 1322b79..5547f25 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer14.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.reducededuplication=true;
 set hive.optimize.reducededuplication.min.reducer=1;
 set hive.optimize.correlation=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer15.q b/ql/src/test/queries/clientpositive/correlationoptimizer15.q
index 43f47db..a06aca2 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer15.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer15.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer2.q b/ql/src/test/queries/clientpositive/correlationoptimizer2.q
index af97f16..eeccd24 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer2.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;
 -- In this query, subquery a and b both have a GroupByOperator and the a and b will be

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer3.q b/ql/src/test/queries/clientpositive/correlationoptimizer3.q
index 89b7c15..94c1bfa 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer3.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;
 -- When Correlation Optimizer is turned off, 5 MR jobs will be generated.

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer4.q b/ql/src/test/queries/clientpositive/correlationoptimizer4.q
index 953d191..02edeff 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer4.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE T1(key INT, val STRING);
 LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
 CREATE TABLE T2(key INT, val STRING);

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer5.q b/ql/src/test/queries/clientpositive/correlationoptimizer5.q
index 287c7a3..45b8cb9 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer5.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE T1(key INT, val STRING);
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1;
 CREATE TABLE T2(key INT, val STRING);

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer6.q b/ql/src/test/queries/clientpositive/correlationoptimizer6.q
index 9b3751e..3cc679a 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer6.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer7.q b/ql/src/test/queries/clientpositive/correlationoptimizer7.q
index dc85586..79b3b31 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer7.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.optimize.correlation=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer8.q b/ql/src/test/queries/clientpositive/correlationoptimizer8.q
index 4f4c3c5..a52b4b9 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer8.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/correlationoptimizer9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer9.q b/ql/src/test/queries/clientpositive/correlationoptimizer9.q
index d58b79c..906f026 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer9.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING);

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/count.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/count.q b/ql/src/test/queries/clientpositive/count.q
index ded8be8..bb84030 100644
--- a/ql/src/test/queries/clientpositive/count.q
+++ b/ql/src/test/queries/clientpositive/count.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 create table abcd (a int, b int, c int, d int);

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cp_sel.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cp_sel.q b/ql/src/test/queries/clientpositive/cp_sel.q
index c674cd4..59f5a2d 100644
--- a/ql/src/test/queries/clientpositive/cp_sel.q
+++ b/ql/src/test/queries/clientpositive/cp_sel.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain
 select key,value,'hello' as ds, 'world' as hr from srcpart where hr=11 order by 1 limit 1;
 select key,value,'hello' as ds, 'world' as hr from srcpart where hr=11 order by 1 limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/create_genericudaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_genericudaf.q b/ql/src/test/queries/clientpositive/create_genericudaf.q
index b2bc042..a59a2ad 100644
--- a/ql/src/test/queries/clientpositive/create_genericudaf.q
+++ b/ql/src/test/queries/clientpositive/create_genericudaf.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 CREATE TEMPORARY FUNCTION test_avg AS 'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage';
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/create_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_view.q b/ql/src/test/queries/clientpositive/create_view.q
index e08274c..e1761cf 100644
--- a/ql/src/test/queries/clientpositive/create_view.q
+++ b/ql/src/test/queries/clientpositive/create_view.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP VIEW view1;
 DROP VIEW view2;
 DROP VIEW view3;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cross_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_join.q b/ql/src/test/queries/clientpositive/cross_join.q
index d30df50..d5f4a49 100644
--- a/ql/src/test/queries/clientpositive/cross_join.q
+++ b/ql/src/test/queries/clientpositive/cross_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- current
 explain select src.key from src join src src2;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cross_product_check_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_product_check_1.q b/ql/src/test/queries/clientpositive/cross_product_check_1.q
index e39912b..bbc7297 100644
--- a/ql/src/test/queries/clientpositive/cross_product_check_1.q
+++ b/ql/src/test/queries/clientpositive/cross_product_check_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/cross_product_check_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_product_check_2.q b/ql/src/test/queries/clientpositive/cross_product_check_2.q
index d7d251f..8acb069 100644
--- a/ql/src/test/queries/clientpositive/cross_product_check_2.q
+++ b/ql/src/test/queries/clientpositive/cross_product_check_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/ctas_colname.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ctas_colname.q b/ql/src/test/queries/clientpositive/ctas_colname.q
index d794e99..b5568fb 100644
--- a/ql/src/test/queries/clientpositive/ctas_colname.q
+++ b/ql/src/test/queries/clientpositive/ctas_colname.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 -- HIVE-4392, column aliases from expressionRR (GBY, etc.) are not valid name for table

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/database.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/database.q b/ql/src/test/queries/clientpositive/database.q
index 7860af5..322dce5 100644
--- a/ql/src/test/queries/clientpositive/database.q
+++ b/ql/src/test/queries/clientpositive/database.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency = true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/date_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/date_2.q b/ql/src/test/queries/clientpositive/date_2.q
index c5346c8..7489ee4 100644
--- a/ql/src/test/queries/clientpositive/date_2.q
+++ b/ql/src/test/queries/clientpositive/date_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table if exists date_2;
 
 create table date_2 (

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q b/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q
index 75b642b..448256c 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q b/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q
index 57eb442..ce5956f 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_1_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_1_1.q b/ql/src/test/queries/clientpositive/decimal_1_1.q
index 83ce521..92c25ff 100644
--- a/ql/src/test/queries/clientpositive/decimal_1_1.q
+++ b/ql/src/test/queries/clientpositive/decimal_1_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table if exists decimal_1_1;
 
 create table decimal_1_1 (d decimal(1,1));

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_3.q b/ql/src/test/queries/clientpositive/decimal_3.q
index e4fba06..f36415d 100644
--- a/ql/src/test/queries/clientpositive/decimal_3.q
+++ b/ql/src/test/queries/clientpositive/decimal_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_3;
 
 CREATE TABLE DECIMAL_3(key decimal(38,18), value int)

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_4.q b/ql/src/test/queries/clientpositive/decimal_4.q
index 699ba3c..f518513 100644
--- a/ql/src/test/queries/clientpositive/decimal_4.q
+++ b/ql/src/test/queries/clientpositive/decimal_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_4_1;
 DROP TABLE IF EXISTS DECIMAL_4_2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_5.q b/ql/src/test/queries/clientpositive/decimal_5.q
index 70e5db0..7bf19d1 100644
--- a/ql/src/test/queries/clientpositive/decimal_5.q
+++ b/ql/src/test/queries/clientpositive/decimal_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_5;
 
 CREATE TABLE DECIMAL_5(key decimal(10,5), value int)

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_6.q b/ql/src/test/queries/clientpositive/decimal_6.q
index b58e224..dd7f680 100644
--- a/ql/src/test/queries/clientpositive/decimal_6.q
+++ b/ql/src/test/queries/clientpositive/decimal_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_6_1;
 DROP TABLE IF EXISTS DECIMAL_6_2;
 DROP TABLE IF EXISTS DECIMAL_6_3;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_join2.q b/ql/src/test/queries/clientpositive/decimal_join2.q
index fb45367..1d3cb9a 100644
--- a/ql/src/test/queries/clientpositive/decimal_join2.q
+++ b/ql/src/test/queries/clientpositive/decimal_join2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_3_txt;
 DROP TABLE IF EXISTS DECIMAL_3;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_precision.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_precision.q b/ql/src/test/queries/clientpositive/decimal_precision.q
index 739352f..7d77455 100644
--- a/ql/src/test/queries/clientpositive/decimal_precision.q
+++ b/ql/src/test/queries/clientpositive/decimal_precision.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_PRECISION;
 
 CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10))

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_serde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_serde.q b/ql/src/test/queries/clientpositive/decimal_serde.q
index be7a4ac..ecd616f 100644
--- a/ql/src/test/queries/clientpositive/decimal_serde.q
+++ b/ql/src/test/queries/clientpositive/decimal_serde.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_TEXT;
 DROP TABLE IF EXISTS DECIMAL_RC;
 DROP TABLE IF EXISTS DECIMAL_LAZY_COL;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_trailing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_trailing.q b/ql/src/test/queries/clientpositive/decimal_trailing.q
index 80afb40..fca69c4 100644
--- a/ql/src/test/queries/clientpositive/decimal_trailing.q
+++ b/ql/src/test/queries/clientpositive/decimal_trailing.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_TRAILING;
 
 CREATE TABLE DECIMAL_TRAILING (

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_udf.q b/ql/src/test/queries/clientpositive/decimal_udf.q
index f9940d9..e1e65e7 100644
--- a/ql/src/test/queries/clientpositive/decimal_udf.q
+++ b/ql/src/test/queries/clientpositive/decimal_udf.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 DROP TABLE IF EXISTS DECIMAL_UDF;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/decimal_udf2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_udf2.q b/ql/src/test/queries/clientpositive/decimal_udf2.q
index d4f6084..425ccba 100644
--- a/ql/src/test/queries/clientpositive/decimal_udf2.q
+++ b/ql/src/test/queries/clientpositive/decimal_udf2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_UDF2;
 
 CREATE TABLE DECIMAL_UDF2 (key decimal(20,10), value int)

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/delete_all_non_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_all_non_partitioned.q b/ql/src/test/queries/clientpositive/delete_all_non_partitioned.q
index 82c18e2..0638537 100644
--- a/ql/src/test/queries/clientpositive/delete_all_non_partitioned.q
+++ b/ql/src/test/queries/clientpositive/delete_all_non_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/delete_all_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_all_partitioned.q b/ql/src/test/queries/clientpositive/delete_all_partitioned.q
index 122b3e2..3c41ed5 100644
--- a/ql/src/test/queries/clientpositive/delete_all_partitioned.q
+++ b/ql/src/test/queries/clientpositive/delete_all_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/delete_tmp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_tmp_table.q b/ql/src/test/queries/clientpositive/delete_tmp_table.q
index c7d8aa6..49e586f 100644
--- a/ql/src/test/queries/clientpositive/delete_tmp_table.q
+++ b/ql/src/test/queries/clientpositive/delete_tmp_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/delete_where_no_match.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_where_no_match.q b/ql/src/test/queries/clientpositive/delete_where_no_match.q
index f13dd73..e558619 100644
--- a/ql/src/test/queries/clientpositive/delete_where_no_match.q
+++ b/ql/src/test/queries/clientpositive/delete_where_no_match.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/delete_where_non_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_where_non_partitioned.q b/ql/src/test/queries/clientpositive/delete_where_non_partitioned.q
index de1ca36..73137bf 100644
--- a/ql/src/test/queries/clientpositive/delete_where_non_partitioned.q
+++ b/ql/src/test/queries/clientpositive/delete_where_non_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/delete_where_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_where_partitioned.q b/ql/src/test/queries/clientpositive/delete_where_partitioned.q
index 2fb950f..df09196 100644
--- a/ql/src/test/queries/clientpositive/delete_where_partitioned.q
+++ b/ql/src/test/queries/clientpositive/delete_where_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/delete_whole_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_whole_partition.q b/ql/src/test/queries/clientpositive/delete_whole_partition.q
index 3d6c1e5..4433f61 100644
--- a/ql/src/test/queries/clientpositive/delete_whole_partition.q
+++ b/ql/src/test/queries/clientpositive/delete_whole_partition.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q b/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q
index c67426f..5bfcc1b 100644
--- a/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q
+++ b/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 ;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/drop_partition_with_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/drop_partition_with_stats.q b/ql/src/test/queries/clientpositive/drop_partition_with_stats.q
index 40b43c2..2211840 100644
--- a/ql/src/test/queries/clientpositive/drop_partition_with_stats.q
+++ b/ql/src/test/queries/clientpositive/drop_partition_with_stats.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- This test verifies that a table partition could be dropped with columns stats computed
 -- The column stats for a partitioned table will go to PART_COL_STATS
 CREATE DATABASE IF NOT EXISTS partstatsdb1;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynamic_partition_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_insert.q b/ql/src/test/queries/clientpositive/dynamic_partition_insert.q
index b4ae3b0..ef04a45 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_insert.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_insert.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE t1 (c1 BIGINT, c2 STRING);
 
 CREATE TABLE t2 (c1 INT, c2 STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q b/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
index 67c4740..6009c74 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q b/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q
index 2f1582a..bb041c9 100644
--- a/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q
+++ b/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.map.aggr=true;
 SET hive.multigroupby.singlereducer=false;
 SET hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynpart_merge.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynpart_merge.q b/ql/src/test/queries/clientpositive/dynpart_merge.q
index 26f4de7..b0337df 100644
--- a/ql/src/test/queries/clientpositive/dynpart_merge.q
+++ b/ql/src/test/queries/clientpositive/dynpart_merge.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=strict;
 set hive.optimize.sort.dynamic.partition=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynpart_sort_opt_bucketing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_opt_bucketing.q b/ql/src/test/queries/clientpositive/dynpart_sort_opt_bucketing.q
index 91fe7c5..4520e2c 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_opt_bucketing.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_opt_bucketing.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.vectorized.execution.enabled=false;
 
 drop table if exists t1_staging;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q b/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q
index 422b711..48a2f87 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.optimize.sort.dynamic.partition=true;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q b/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q
index 2d21f32..8b7f4eb 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.optimize.sort.dynamic.partition=true;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q b/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q
index 8fd79d6..8dac772 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.optimize.sort.dynamic.partition=true;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid.q b/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid.q
index d1d1851..5e4e0f7 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/empty_dir_in_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/empty_dir_in_table.q b/ql/src/test/queries/clientpositive/empty_dir_in_table.q
index 630c4c1..447ca79 100644
--- a/ql/src/test/queries/clientpositive/empty_dir_in_table.q
+++ b/ql/src/test/queries/clientpositive/empty_dir_in_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} hdfs:///target/tmp/test_empty_table;
 
 create external table roottable (key string) row format delimited fields terminated by '\\t' stored as textfile location 'hdfs:///target/tmp/test_empty_table';

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/encryption_drop_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_drop_partition.q b/ql/src/test/queries/clientpositive/encryption_drop_partition.q
index e1c1796..a26aa19 100644
--- a/ql/src/test/queries/clientpositive/encryption_drop_partition.q
+++ b/ql/src/test/queries/clientpositive/encryption_drop_partition.q
@@ -4,7 +4,7 @@
 
 set hive.cli.errors.ignore=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
-
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS encrypted_table_dp PURGE;
 CREATE TABLE encrypted_table_dp (key INT, value STRING) partitioned by (p STRING) LOCATION '${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table_dp';
 CRYPTO CREATE_KEY --keyName key_128 --bitLength 128;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/encryption_insert_partition_dynamic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_insert_partition_dynamic.q b/ql/src/test/queries/clientpositive/encryption_insert_partition_dynamic.q
index 371fd75..6f1f621 100644
--- a/ql/src/test/queries/clientpositive/encryption_insert_partition_dynamic.q
+++ b/ql/src/test/queries/clientpositive/encryption_insert_partition_dynamic.q
@@ -1,4 +1,5 @@
 set hive.exec.dynamic.partition.mode=nonstrict;
+set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
@@ -54,4 +55,4 @@ select * from unencryptedTable order by key;
 -- clean up
 drop table encryptedTable PURGE;
 CRYPTO DELETE_KEY --keyName key_1;
-drop table unencryptedTable PURGE;
\ No newline at end of file
+drop table unencryptedTable PURGE;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/encryption_insert_partition_static.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_insert_partition_static.q b/ql/src/test/queries/clientpositive/encryption_insert_partition_static.q
index b52e740..269ac7d 100644
--- a/ql/src/test/queries/clientpositive/encryption_insert_partition_static.q
+++ b/ql/src/test/queries/clientpositive/encryption_insert_partition_static.q
@@ -1,6 +1,6 @@
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
-
+set hive.mapred.mode=nonstrict;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q b/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
index cf4d040..089723f 100644
--- a/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
+++ b/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS encrypted_table PURGE;
 CREATE TABLE encrypted_table (key INT, value STRING) LOCATION '${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table';
 CRYPTO CREATE_KEY --keyName key_128 --bitLength 128;
 CRYPTO CREATE_ZONE --keyName key_128 --path ${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table;
-
+set hive.mapred.mode=nonstrict;
 INSERT OVERWRITE TABLE encrypted_table SELECT * FROM src;
 
 SELECT * FROM encrypted_table;
@@ -12,4 +12,4 @@ SELECT * FROM encrypted_table;
 EXPLAIN EXTENDED SELECT * FROM src t1 JOIN encrypted_table t2 WHERE t1.key = t2.key;
 
 drop table encrypted_table PURGE;
-CRYPTO DELETE_KEY --keyName key_128;
\ No newline at end of file
+CRYPTO DELETE_KEY --keyName key_128;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q b/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q
index dfd3406..4dcea1f 100644
--- a/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q
+++ b/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q
@@ -10,7 +10,7 @@ DROP TABLE IF EXISTS table_key_2 PURGE;
 CREATE TABLE table_key_2 (key INT, value STRING) LOCATION '${hiveconf:hive.metastore.warehouse.dir}/table_key_2';
 CRYPTO CREATE_KEY --keyName key_2 --bitLength 256;
 CRYPTO CREATE_ZONE --keyName key_2 --path ${hiveconf:hive.metastore.warehouse.dir}/table_key_2;
-
+set hive.mapred.mode=nonstrict;
 INSERT OVERWRITE TABLE table_key_1 SELECT * FROM src;
 INSERT OVERWRITE TABLE table_key_2 SELECT * FROM src;
 
@@ -21,4 +21,4 @@ DROP TABLE table_key_1 PURGE;
 DROP TABLE table_key_2 PURGE;
 
 CRYPTO DELETE_KEY --keyName key_1;
-CRYPTO DELETE_KEY --keyName key_2;
\ No newline at end of file
+CRYPTO DELETE_KEY --keyName key_2;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/escape1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape1.q b/ql/src/test/queries/clientpositive/escape1.q
index d29a7a8..967db78 100644
--- a/ql/src/test/queries/clientpositive/escape1.q
+++ b/ql/src/test/queries/clientpositive/escape1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.max.dynamic.partitions.pernode=200;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/escape2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape2.q b/ql/src/test/queries/clientpositive/escape2.q
index 2460134..416d2e4 100644
--- a/ql/src/test/queries/clientpositive/escape2.q
+++ b/ql/src/test/queries/clientpositive/escape2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.max.dynamic.partitions.pernode=200;
 set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/escape_orderby1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape_orderby1.q b/ql/src/test/queries/clientpositive/escape_orderby1.q
index 39a1c4c..315075a 100644
--- a/ql/src/test/queries/clientpositive/escape_orderby1.q
+++ b/ql/src/test/queries/clientpositive/escape_orderby1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- escaped column names in order by are not working jira 3267
 explain
 select key, value from src order by key, value;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exchgpartition2lel.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exchgpartition2lel.q b/ql/src/test/queries/clientpositive/exchgpartition2lel.q
index 2b15894..b009897 100644
--- a/ql/src/test/queries/clientpositive/exchgpartition2lel.q
+++ b/ql/src/test/queries/clientpositive/exchgpartition2lel.q
@@ -9,7 +9,7 @@ CREATE TABLE t3 (a int) PARTITIONED BY (d1 int, d2 int);
 CREATE TABLE t4 (a int) PARTITIONED BY (d1 int, d2 int);
 CREATE TABLE t5 (a int) PARTITIONED BY (d1 int, d2 int, d3 int);
 CREATE TABLE t6 (a int) PARTITIONED BY (d1 int, d2 int, d3 int);
-
+set hive.mapred.mode=nonstrict;
 INSERT OVERWRITE TABLE t1 PARTITION (d1 = 1) SELECT key FROM src where key = 100 limit 1;
 INSERT OVERWRITE TABLE t3 PARTITION (d1 = 1, d2 = 1) SELECT key FROM src where key = 100 limit 1;
 INSERT OVERWRITE TABLE t5 PARTITION (d1 = 1, d2 = 1, d3=1) SELECT key FROM src where key = 100 limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q b/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
index 474a5a4..495306b 100644
--- a/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
+++ b/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_02_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_02_part.q b/ql/src/test/queries/clientpositive/exim_02_part.q
index dbd2c6b..9033083 100644
--- a/ql/src/test/queries/clientpositive/exim_02_part.q
+++ b/ql/src/test/queries/clientpositive/exim_02_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_04_all_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_04_all_part.q b/ql/src/test/queries/clientpositive/exim_04_all_part.q
index b2567fb..8fb7aa0 100644
--- a/ql/src/test/queries/clientpositive/exim_04_all_part.q
+++ b/ql/src/test/queries/clientpositive/exim_04_all_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q b/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
index cd63193..6acac7b 100644
--- a/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
+++ b/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_05_some_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_05_some_part.q b/ql/src/test/queries/clientpositive/exim_05_some_part.q
index a2c9773..9e07a9e 100644
--- a/ql/src/test/queries/clientpositive/exim_05_some_part.q
+++ b/ql/src/test/queries/clientpositive/exim_05_some_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_06_one_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_06_one_part.q b/ql/src/test/queries/clientpositive/exim_06_one_part.q
index 3a61296..0dcdaa1 100644
--- a/ql/src/test/queries/clientpositive/exim_06_one_part.q
+++ b/ql/src/test/queries/clientpositive/exim_06_one_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q b/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
index 8c774d5..e897ee7 100644
--- a/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
+++ b/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q b/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
index 53fc293..4a94418 100644
--- a/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
+++ b/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_15_external_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_15_external_part.q b/ql/src/test/queries/clientpositive/exim_15_external_part.q
index 989dd6c..f1f2c38 100644
--- a/ql/src/test/queries/clientpositive/exim_15_external_part.q
+++ b/ql/src/test/queries/clientpositive/exim_15_external_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_16_part_external.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_16_part_external.q b/ql/src/test/queries/clientpositive/exim_16_part_external.q
index 7eec358..60dbe9e 100644
--- a/ql/src/test/queries/clientpositive/exim_16_part_external.q
+++ b/ql/src/test/queries/clientpositive/exim_16_part_external.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/bf7add41/ql/src/test/queries/clientpositive/exim_17_part_managed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_17_part_managed.q b/ql/src/test/queries/clientpositive/exim_17_part_managed.q
index 20cd7e0..6cb912f 100644
--- a/ql/src/test/queries/clientpositive/exim_17_part_managed.q
+++ b/ql/src/test/queries/clientpositive/exim_17_part_managed.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;


Mime
View raw message