You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2015/12/03 22:41:50 UTC

[1/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Repository: hive
Updated Branches:
  refs/heads/master 72c5d61f5 -> d13b5db21


http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_view.q b/ql/src/test/queries/clientpositive/union_view.q
index 733ed3e..fa39450 100644
--- a/ql/src/test/queries/clientpositive/union_view.q
+++ b/ql/src/test/queries/clientpositive/union_view.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 set hive.explain.user=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q b/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q
index a704860..8e23f7c 100644
--- a/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q
+++ b/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/updateAccessTime.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/updateAccessTime.q b/ql/src/test/queries/clientpositive/updateAccessTime.q
index 908b6ec..c65ad42 100644
--- a/ql/src/test/queries/clientpositive/updateAccessTime.q
+++ b/ql/src/test/queries/clientpositive/updateAccessTime.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table tstsrc;
 
 set hive.exec.pre.hooks = org.apache.hadoop.hive.ql.hooks.PreExecutePrinter,org.apache.hadoop.hive.ql.hooks.EnforceReadOnlyTables,org.apache.hadoop.hive.ql.hooks.UpdateInputAccessTimeHook$PreExec;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q b/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
index 7534999..755b0bb 100644
--- a/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
+++ b/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition.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/d13b5db2/ql/src/test/queries/clientpositive/update_all_non_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_all_non_partitioned.q b/ql/src/test/queries/clientpositive/update_all_non_partitioned.q
index d611925..c4c2d2c 100644
--- a/ql/src/test/queries/clientpositive/update_all_non_partitioned.q
+++ b/ql/src/test/queries/clientpositive/update_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/d13b5db2/ql/src/test/queries/clientpositive/update_all_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_all_partitioned.q b/ql/src/test/queries/clientpositive/update_all_partitioned.q
index d7aa24f..aec5c1e 100644
--- a/ql/src/test/queries/clientpositive/update_all_partitioned.q
+++ b/ql/src/test/queries/clientpositive/update_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/d13b5db2/ql/src/test/queries/clientpositive/update_all_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_all_types.q b/ql/src/test/queries/clientpositive/update_all_types.q
index 543fd09..17ce742 100644
--- a/ql/src/test/queries/clientpositive/update_all_types.q
+++ b/ql/src/test/queries/clientpositive/update_all_types.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/d13b5db2/ql/src/test/queries/clientpositive/update_tmp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_tmp_table.q b/ql/src/test/queries/clientpositive/update_tmp_table.q
index 12309e5..6a6e11d 100644
--- a/ql/src/test/queries/clientpositive/update_tmp_table.q
+++ b/ql/src/test/queries/clientpositive/update_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/d13b5db2/ql/src/test/queries/clientpositive/update_two_cols.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_two_cols.q b/ql/src/test/queries/clientpositive/update_two_cols.q
index 8b1719b..3473bd4 100644
--- a/ql/src/test/queries/clientpositive/update_two_cols.q
+++ b/ql/src/test/queries/clientpositive/update_two_cols.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/d13b5db2/ql/src/test/queries/clientpositive/update_where_no_match.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_where_no_match.q b/ql/src/test/queries/clientpositive/update_where_no_match.q
index 8e6faaf..af4d7f9 100644
--- a/ql/src/test/queries/clientpositive/update_where_no_match.q
+++ b/ql/src/test/queries/clientpositive/update_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/d13b5db2/ql/src/test/queries/clientpositive/update_where_non_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_where_non_partitioned.q b/ql/src/test/queries/clientpositive/update_where_non_partitioned.q
index b7a97c2..22f3e87 100644
--- a/ql/src/test/queries/clientpositive/update_where_non_partitioned.q
+++ b/ql/src/test/queries/clientpositive/update_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/d13b5db2/ql/src/test/queries/clientpositive/update_where_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_where_partitioned.q b/ql/src/test/queries/clientpositive/update_where_partitioned.q
index ba35e35..936390d 100644
--- a/ql/src/test/queries/clientpositive/update_where_partitioned.q
+++ b/ql/src/test/queries/clientpositive/update_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/d13b5db2/ql/src/test/queries/clientpositive/varchar_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/varchar_1.q b/ql/src/test/queries/clientpositive/varchar_1.q
index bed61f3..efaf3e5 100644
--- a/ql/src/test/queries/clientpositive/varchar_1.q
+++ b/ql/src/test/queries/clientpositive/varchar_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table varchar1;
 drop table varchar1_1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/varchar_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/varchar_join1.q b/ql/src/test/queries/clientpositive/varchar_join1.q
index 9422687..d710339 100644
--- a/ql/src/test/queries/clientpositive/varchar_join1.q
+++ b/ql/src/test/queries/clientpositive/varchar_join1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table varchar_join1_vc1;
 drop table varchar_join1_vc2;
 drop table varchar_join1_str;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_aggregate_without_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_aggregate_without_gby.q b/ql/src/test/queries/clientpositive/vector_aggregate_without_gby.q
index 9a026ed..01bd33d 100644
--- a/ql/src/test/queries/clientpositive/vector_aggregate_without_gby.q
+++ b/ql/src/test/queries/clientpositive/vector_aggregate_without_gby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table testvec(id int, dt int, greg_dt string) stored as orc;
 insert into table testvec
 values 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_auto_smb_mapjoin_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_auto_smb_mapjoin_14.q b/ql/src/test/queries/clientpositive/vector_auto_smb_mapjoin_14.q
index fa7fff8..d7e1e10 100644
--- a/ql/src/test/queries/clientpositive/vector_auto_smb_mapjoin_14.q
+++ b/ql/src/test/queries/clientpositive/vector_auto_smb_mapjoin_14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 ;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_between_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_between_in.q b/ql/src/test/queries/clientpositive/vector_between_in.q
index 28df728..d57f980 100644
--- a/ql/src/test/queries/clientpositive/vector_between_in.q
+++ b/ql/src/test/queries/clientpositive/vector_between_in.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q b/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q
index fd9bf6f..1a9d280 100644
--- a/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q
+++ b/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_bround.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_bround.q b/ql/src/test/queries/clientpositive/vector_bround.q
index 380d51c..9130540 100644
--- a/ql/src/test/queries/clientpositive/vector_bround.q
+++ b/ql/src/test/queries/clientpositive/vector_bround.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table test_vector_bround(v0 double, v1 double) stored as orc;
 insert into table test_vector_bround
 values

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_bucket.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_bucket.q b/ql/src/test/queries/clientpositive/vector_bucket.q
index 74cbefc..39436c9 100644
--- a/ql/src/test/queries/clientpositive/vector_bucket.q
+++ b/ql/src/test/queries/clientpositive/vector_bucket.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.support.concurrency=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_cast_constant.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_cast_constant.q b/ql/src/test/queries/clientpositive/vector_cast_constant.q
index 5b762c7..c50dd8f 100644
--- a/ql/src/test/queries/clientpositive/vector_cast_constant.q
+++ b/ql/src/test/queries/clientpositive/vector_cast_constant.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_char_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_char_2.q b/ql/src/test/queries/clientpositive/vector_char_2.q
index efa3154..f1bb75b 100644
--- a/ql/src/test/queries/clientpositive/vector_char_2.q
+++ b/ql/src/test/queries/clientpositive/vector_char_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 drop table char_2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q b/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q
index a31e7b9..58a73be 100644
--- a/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q
+++ b/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_coalesce_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_coalesce_2.q b/ql/src/test/queries/clientpositive/vector_coalesce_2.q
index 1dee7d4..c847e20 100644
--- a/ql/src/test/queries/clientpositive/vector_coalesce_2.q
+++ b/ql/src/test/queries/clientpositive/vector_coalesce_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=false;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_count_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_count_distinct.q b/ql/src/test/queries/clientpositive/vector_count_distinct.q
index 985c32e..ec72079 100644
--- a/ql/src/test/queries/clientpositive/vector_count_distinct.q
+++ b/ql/src/test/queries/clientpositive/vector_count_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_data_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_data_types.q b/ql/src/test/queries/clientpositive/vector_data_types.q
index 06a650c..c7e0d1b 100644
--- a/ql/src/test/queries/clientpositive/vector_data_types.q
+++ b/ql/src/test/queries/clientpositive/vector_data_types.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 
 DROP TABLE over1k;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_date_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_date_1.q b/ql/src/test/queries/clientpositive/vector_date_1.q
index 165f86a..072ed5c 100644
--- a/ql/src/test/queries/clientpositive/vector_date_1.q
+++ b/ql/src/test/queries/clientpositive/vector_date_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 
 set hive.vectorized.execution.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_1.q b/ql/src/test/queries/clientpositive/vector_decimal_1.q
index f6578cd..8a1503f 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_1.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_10_0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_10_0.q b/ql/src/test/queries/clientpositive/vector_decimal_10_0.q
index 32898e6..596b2bd 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_10_0.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_10_0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_2.q b/ql/src/test/queries/clientpositive/vector_decimal_2.q
index 79d602a..f1477ce 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_2.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_3.q b/ql/src/test/queries/clientpositive/vector_decimal_3.q
index 77f3a7c..9fa5d6f 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_3.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_4.q b/ql/src/test/queries/clientpositive/vector_decimal_4.q
index c0762fb..29c9875 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_4.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_5.q b/ql/src/test/queries/clientpositive/vector_decimal_5.q
index 8d3da4d..7cf604d 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_5.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_6.q b/ql/src/test/queries/clientpositive/vector_decimal_6.q
index 3352704..1d0c3ae 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_6.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_expressions.q b/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
index 233a732..33d0747 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_expressions.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/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q b/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
index 16c2ed0..3007239 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q b/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q
index 74c7490..4ebde6a 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 CREATE TABLE decimal_test STORED AS ORC AS SELECT cbigint, cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc;
 SET hive.vectorized.execution.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_precision.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_precision.q b/ql/src/test/queries/clientpositive/vector_decimal_precision.q
index c7f449a..cc3fb63 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_precision.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_precision.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_round.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_round.q b/ql/src/test/queries/clientpositive/vector_decimal_round.q
index 7ebc75b..bf83163 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_round.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_round.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_round_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_round_2.q b/ql/src/test/queries/clientpositive/vector_decimal_round_2.q
index 23be1fc..0020325 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_round_2.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_round_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_trailing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_trailing.q b/ql/src/test/queries/clientpositive/vector_decimal_trailing.q
index 4639fee..5f13396 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_trailing.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_trailing.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_udf.q b/ql/src/test/queries/clientpositive/vector_decimal_udf.q
index a8ee2e8..416d348 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_udf.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_udf.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_decimal_udf2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_udf2.q b/ql/src/test/queries/clientpositive/vector_decimal_udf2.q
index 0259626..433f464 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_udf2.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_udf2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_distinct_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_distinct_2.q b/ql/src/test/queries/clientpositive/vector_distinct_2.q
index 07945e3..509b262 100644
--- a/ql/src/test/queries/clientpositive/vector_distinct_2.q
+++ b/ql/src/test/queries/clientpositive/vector_distinct_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_elt.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_elt.q b/ql/src/test/queries/clientpositive/vector_elt.q
index e11b35f..f44a3be 100644
--- a/ql/src/test/queries/clientpositive/vector_elt.q
+++ b/ql/src/test/queries/clientpositive/vector_elt.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_groupby_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_groupby_3.q b/ql/src/test/queries/clientpositive/vector_groupby_3.q
index 014f9e1..d42d7f1 100644
--- a/ql/src/test/queries/clientpositive/vector_groupby_3.q
+++ b/ql/src/test/queries/clientpositive/vector_groupby_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_groupby_reduce.q b/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
index 8fe6b7e..e78b57f 100644
--- a/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
+++ b/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_if_expr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_if_expr.q b/ql/src/test/queries/clientpositive/vector_if_expr.q
index 2e704b7..475cecf 100644
--- a/ql/src/test/queries/clientpositive/vector_if_expr.q
+++ b/ql/src/test/queries/clientpositive/vector_if_expr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_inner_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_inner_join.q b/ql/src/test/queries/clientpositive/vector_inner_join.q
index aa242a5..24b66bf 100644
--- a/ql/src/test/queries/clientpositive/vector_inner_join.q
+++ b/ql/src/test/queries/clientpositive/vector_inner_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_interval_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_interval_1.q b/ql/src/test/queries/clientpositive/vector_interval_1.q
index ffa9e16..8fefe41 100644
--- a/ql/src/test/queries/clientpositive/vector_interval_1.q
+++ b/ql/src/test/queries/clientpositive/vector_interval_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 
 set hive.vectorized.execution.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_interval_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_interval_2.q b/ql/src/test/queries/clientpositive/vector_interval_2.q
index d413f5a..5afb511 100644
--- a/ql/src/test/queries/clientpositive/vector_interval_2.q
+++ b/ql/src/test/queries/clientpositive/vector_interval_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q b/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q
index 671aa2c..36ccd35 100644
--- a/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_join_filters.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_join_filters.q b/ql/src/test/queries/clientpositive/vector_join_filters.q
index adf525c..aac10c1 100644
--- a/ql/src/test/queries/clientpositive/vector_join_filters.q
+++ b/ql/src/test/queries/clientpositive/vector_join_filters.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_join_nulls.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_join_nulls.q b/ql/src/test/queries/clientpositive/vector_join_nulls.q
index 6cfb7a8..b978b41 100644
--- a/ql/src/test/queries/clientpositive/vector_join_nulls.q
+++ b/ql/src/test/queries/clientpositive/vector_join_nulls.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_left_outer_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_left_outer_join.q b/ql/src/test/queries/clientpositive/vector_left_outer_join.q
index 2fc5240..ddf2660 100644
--- a/ql/src/test/queries/clientpositive/vector_left_outer_join.q
+++ b/ql/src/test/queries/clientpositive/vector_left_outer_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.vectorized.execution.enabled=true;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_left_outer_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_left_outer_join2.q b/ql/src/test/queries/clientpositive/vector_left_outer_join2.q
index 3ba67a2..5da5d50 100644
--- a/ql/src/test/queries/clientpositive/vector_left_outer_join2.q
+++ b/ql/src/test/queries/clientpositive/vector_left_outer_join2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q b/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q
index a83d95f..c9e9e48 100644
--- a/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q
+++ b/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q b/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q
index bb87344..1f17669 100644
--- a/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q
+++ b/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_non_string_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_non_string_partition.q b/ql/src/test/queries/clientpositive/vector_non_string_partition.q
index 7759796..bffc93e 100644
--- a/ql/src/test/queries/clientpositive/vector_non_string_partition.q
+++ b/ql/src/test/queries/clientpositive/vector_non_string_partition.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 CREATE TABLE non_string_part(cint INT, cstring1 STRING, cdouble DOUBLE, ctimestamp1 TIMESTAMP) PARTITIONED BY (ctinyint tinyint) STORED AS ORC;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_orderby_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_orderby_5.q b/ql/src/test/queries/clientpositive/vector_orderby_5.q
index 2014ef7..30bcaef 100644
--- a/ql/src/test/queries/clientpositive/vector_orderby_5.q
+++ b/ql/src/test/queries/clientpositive/vector_orderby_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_outer_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join0.q b/ql/src/test/queries/clientpositive/vector_outer_join0.q
index f8caa83..dce3a1b 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join0.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_outer_join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join5.q b/ql/src/test/queries/clientpositive/vector_outer_join5.q
index 4b6b6d6..18b9ab4 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join5.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_outer_join6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join6.q b/ql/src/test/queries/clientpositive/vector_outer_join6.q
index b430108..06fa385 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join6.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q b/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q
index f2335e4..f25374d 100644
--- a/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q
+++ b/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q b/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
index c04a523..f53d8c0 100644
--- a/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
+++ b/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_reduce1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_reduce1.q b/ql/src/test/queries/clientpositive/vector_reduce1.q
index 6284d76..cfd803f 100644
--- a/ql/src/test/queries/clientpositive/vector_reduce1.q
+++ b/ql/src/test/queries/clientpositive/vector_reduce1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.reducesink.new.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_reduce2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_reduce2.q b/ql/src/test/queries/clientpositive/vector_reduce2.q
index e8607e2..ab67132 100644
--- a/ql/src/test/queries/clientpositive/vector_reduce2.q
+++ b/ql/src/test/queries/clientpositive/vector_reduce2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.reducesink.new.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_reduce3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_reduce3.q b/ql/src/test/queries/clientpositive/vector_reduce3.q
index c0c4288..bf8206f 100644
--- a/ql/src/test/queries/clientpositive/vector_reduce3.q
+++ b/ql/src/test/queries/clientpositive/vector_reduce3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.reducesink.new.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_string_concat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_string_concat.q b/ql/src/test/queries/clientpositive/vector_string_concat.q
index 06bd68e..f3a5965 100644
--- a/ql/src/test/queries/clientpositive/vector_string_concat.q
+++ b/ql/src/test/queries/clientpositive/vector_string_concat.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q b/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
index c5c9048..ac0570e 100644
--- a/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
+++ b/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_0.q b/ql/src/test/queries/clientpositive/vectorization_0.q
index d786f74..caa6a6a 100644
--- a/ql/src/test/queries/clientpositive/vectorization_0.q
+++ b/ql/src/test/queries/clientpositive/vectorization_0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_12.q b/ql/src/test/queries/clientpositive/vectorization_12.q
index a2737be..bc31f3c 100644
--- a/ql/src/test/queries/clientpositive/vectorization_12.q
+++ b/ql/src/test/queries/clientpositive/vectorization_12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_13.q b/ql/src/test/queries/clientpositive/vectorization_13.q
index 831530e..005808b 100644
--- a/ql/src/test/queries/clientpositive/vectorization_13.q
+++ b/ql/src/test/queries/clientpositive/vectorization_13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_14.q b/ql/src/test/queries/clientpositive/vectorization_14.q
index 2502fa8..4796c18 100644
--- a/ql/src/test/queries/clientpositive/vectorization_14.q
+++ b/ql/src/test/queries/clientpositive/vectorization_14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_15.q b/ql/src/test/queries/clientpositive/vectorization_15.q
index 1c82475..21ba8c8 100644
--- a/ql/src/test/queries/clientpositive/vectorization_15.q
+++ b/ql/src/test/queries/clientpositive/vectorization_15.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_16.q b/ql/src/test/queries/clientpositive/vectorization_16.q
index 84f1faa..11b709f 100644
--- a/ql/src/test/queries/clientpositive/vectorization_16.q
+++ b/ql/src/test/queries/clientpositive/vectorization_16.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_17.q b/ql/src/test/queries/clientpositive/vectorization_17.q
index cb992aa..1306f6b 100644
--- a/ql/src/test/queries/clientpositive/vectorization_17.q
+++ b/ql/src/test/queries/clientpositive/vectorization_17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_3.q b/ql/src/test/queries/clientpositive/vectorization_3.q
index 5423b0b..d6e6580 100644
--- a/ql/src/test/queries/clientpositive/vectorization_3.q
+++ b/ql/src/test/queries/clientpositive/vectorization_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_7.q b/ql/src/test/queries/clientpositive/vectorization_7.q
index 15ddcfb..131f570 100644
--- a/ql/src/test/queries/clientpositive/vectorization_7.q
+++ b/ql/src/test/queries/clientpositive/vectorization_7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_8.q b/ql/src/test/queries/clientpositive/vectorization_8.q
index 46715ae..2d357f1 100644
--- a/ql/src/test/queries/clientpositive/vectorization_8.q
+++ b/ql/src/test/queries/clientpositive/vectorization_8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_9.q b/ql/src/test/queries/clientpositive/vectorization_9.q
index 84f1faa..11b709f 100644
--- a/ql/src/test/queries/clientpositive/vectorization_9.q
+++ b/ql/src/test/queries/clientpositive/vectorization_9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_div0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_div0.q b/ql/src/test/queries/clientpositive/vectorization_div0.q
index 78f91f4..05d81d0 100644
--- a/ql/src/test/queries/clientpositive/vectorization_div0.q
+++ b/ql/src/test/queries/clientpositive/vectorization_div0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_limit.q b/ql/src/test/queries/clientpositive/vectorization_limit.q
index f261a36..707f1ed 100644
--- a/ql/src/test/queries/clientpositive/vectorization_limit.q
+++ b/ql/src/test/queries/clientpositive/vectorization_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 explain SELECT cbigint, cdouble FROM alltypesorc WHERE cbigint < cdouble and cint > 0 limit 7;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_not.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_not.q b/ql/src/test/queries/clientpositive/vectorization_not.q
index bfd3dd7..7ac507b 100644
--- a/ql/src/test/queries/clientpositive/vectorization_not.q
+++ b/ql/src/test/queries/clientpositive/vectorization_not.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 SELECT AVG(cbigint),
        (-(AVG(cbigint))),

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_part.q b/ql/src/test/queries/clientpositive/vectorization_part.q
index 0e34585..8d677db 100644
--- a/ql/src/test/queries/clientpositive/vectorization_part.q
+++ b/ql/src/test/queries/clientpositive/vectorization_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint smallint, cint int, cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 boolean) partitioned by (ds string) STORED AS ORC;
 insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_part_project.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_part_project.q b/ql/src/test/queries/clientpositive/vectorization_part_project.q
index a6abb86..3a48f20 100644
--- a/ql/src/test/queries/clientpositive/vectorization_part_project.q
+++ b/ql/src/test/queries/clientpositive/vectorization_part_project.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint smallint, cint int, cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 boolean) partitioned by (ds string) STORED AS ORC;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_part_varchar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_part_varchar.q b/ql/src/test/queries/clientpositive/vectorization_part_varchar.q
index e78f9f5..d371de8 100644
--- a/ql/src/test/queries/clientpositive/vectorization_part_varchar.q
+++ b/ql/src/test/queries/clientpositive/vectorization_part_varchar.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 CREATE TABLE alltypesorc_part_varchar(ctinyint tinyint, csmallint smallint, cint int, cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 boolean) partitioned by (ds varchar(4)) STORED AS ORC;
 insert overwrite table alltypesorc_part_varchar partition (ds='2011') select * from alltypesorc limit 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_pushdown.q b/ql/src/test/queries/clientpositive/vectorization_pushdown.q
index c54c529..b33cfa7 100644
--- a/ql/src/test/queries/clientpositive/vectorization_pushdown.q
+++ b/ql/src/test/queries/clientpositive/vectorization_pushdown.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.optimize.index.filter=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorization_short_regress.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_short_regress.q b/ql/src/test/queries/clientpositive/vectorization_short_regress.q
index 29cdf19..88ed00d 100644
--- a/ql/src/test/queries/clientpositive/vectorization_short_regress.q
+++ b/ql/src/test/queries/clientpositive/vectorization_short_regress.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_casts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_casts.q b/ql/src/test/queries/clientpositive/vectorized_casts.q
index 8e0bdbc..0880e29 100644
--- a/ql/src/test/queries/clientpositive/vectorized_casts.q
+++ b/ql/src/test/queries/clientpositive/vectorized_casts.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;
 SET hive.vectorized.execution.enabled = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_context.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_context.q b/ql/src/test/queries/clientpositive/vectorized_context.q
index aeb1f2e..657270e 100644
--- a/ql/src/test/queries/clientpositive/vectorized_context.q
+++ b/ql/src/test/queries/clientpositive/vectorized_context.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 create table store(s_store_sk int, s_city string)
 stored as orc;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_date_funcs.q b/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
index f55ad03..59df32a 100644
--- a/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
+++ b/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q b/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
index bad6baa..6900dc0 100644
--- a/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
+++ b/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q b/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q
index 69cdca9..09847b1 100644
--- a/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/vectorized_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/d13b5db2/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_mapjoin.q b/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
index 11004a8..6500d41 100644
--- a/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q b/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
index 849af18..4332898 100644
--- a/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_parquet_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_parquet_types.q b/ql/src/test/queries/clientpositive/vectorized_parquet_types.q
index 0aaa432..bf41958 100644
--- a/ql/src/test/queries/clientpositive/vectorized_parquet_types.q
+++ b/ql/src/test/queries/clientpositive/vectorized_parquet_types.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 
 DROP TABLE parquet_types_staging;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q b/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q
index dc124b1..2b7d44b 100644
--- a/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q
+++ b/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 --This query must pass even when vectorized reader is not available for
 --RC files. The query must fall back to the non-vector mode and run successfully.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q b/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
index 92aae2c..f57d062 100644
--- a/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
+++ b/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q b/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
index 119c1c7..aaf85fc 100644
--- a/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
+++ b/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- Test timestamp functions in vectorized mode to verify they run correctly end-to-end.
 -- Turning on vectorization has been temporarily moved after filling the test table

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/vectorized_timestamp_ints_casts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_timestamp_ints_casts.q b/ql/src/test/queries/clientpositive/vectorized_timestamp_ints_casts.q
index f297070..15964c9 100644
--- a/ql/src/test/queries/clientpositive/vectorized_timestamp_ints_casts.q
+++ b/ql/src/test/queries/clientpositive/vectorized_timestamp_ints_casts.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled = true;
 SET hive.int.timestamp.conversion.in.seconds=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/virtual_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/virtual_column.q b/ql/src/test/queries/clientpositive/virtual_column.q
index e74a608..5185f97 100644
--- a/ql/src/test/queries/clientpositive/virtual_column.q
+++ b/ql/src/test/queries/clientpositive/virtual_column.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 select INPUT__FILE__NAME, key, BLOCK__OFFSET__INSIDE__FILE from src;
 
 select key, count(INPUT__FILE__NAME) from src group by key order by key;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/windowing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/windowing.q b/ql/src/test/queries/clientpositive/windowing.q
index 2378e06..4a8383a 100644
--- a/ql/src/test/queries/clientpositive/windowing.q
+++ b/ql/src/test/queries/clientpositive/windowing.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapred.reduce.tasks=4;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out b/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out
index 18fe689..e80d828 100644
--- a/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out
+++ b/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 6:43 Invalid table alias or column reference 'p_complex': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
+FAILED: SemanticException [Error 10004]: Line 8:43 Invalid table alias or column reference 'p_complex': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java b/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java
index d90002b..7bfbdb9 100644
--- a/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java
+++ b/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java
@@ -299,7 +299,7 @@ public abstract class CLIServiceTest {
     ExecutorService executor = Executors.newFixedThreadPool(THREAD_COUNT);
     CountDownLatch cdlIn = new CountDownLatch(THREAD_COUNT), cdlOut = new CountDownLatch(1);
     @SuppressWarnings("unchecked")
-    Callable<Void>[] cs = (Callable<Void>[])new Callable[3];
+    Callable<Void>[] cs = new Callable[3];
     // Create callables with different queries.
     String query = "SELECT ID + %1$d FROM " + tableName;
     cs[0] = createQueryCallable(
@@ -314,7 +314,7 @@ public abstract class CLIServiceTest {
         query, confOverlay, longPollingTimeout, QUERY_COUNT, cdlIn, cdlOut);
 
     @SuppressWarnings("unchecked")
-    FutureTask<Void>[] tasks = (FutureTask<Void>[])new FutureTask[THREAD_COUNT];
+    FutureTask<Void>[] tasks = new FutureTask[THREAD_COUNT];
     for (int i = 0; i < THREAD_COUNT; ++i) {
       tasks[i] = new FutureTask<Void>(cs[i % cs.length]);
       executor.execute(tasks[i]);
@@ -338,6 +338,7 @@ public abstract class CLIServiceTest {
       final Map<String, String> confOverlay, final long longPollingTimeout,
       final int queryCount, final CountDownLatch cdlIn, final CountDownLatch cdlOut) {
     return new Callable<Void>() {
+      @Override
       public Void call() throws Exception {
         syncThreadStart(cdlIn, cdlOut);
         SessionHandle sessionHandle = openSession(confOverlay);


[8/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Posted by ha...@apache.org.
HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Signed-off-by: Ashutosh Chauhan <ha...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/d13b5db2
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/d13b5db2
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/d13b5db2

Branch: refs/heads/master
Commit: d13b5db21b8f31da60f18276326d291a10022b97
Parents: 72c5d61
Author: Ashutosh Chauhan <ha...@apache.org>
Authored: Wed Dec 2 09:45:07 2015 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Thu Dec 3 13:40:24 2015 -0800

----------------------------------------------------------------------
 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java       | 2 +-
 contrib/src/test/queries/clientnegative/invalid_row_sequence.q  | 2 +-
 contrib/src/test/queries/clientpositive/dboutput.q              | 1 +
 contrib/src/test/queries/clientpositive/serde_regex.q           | 1 +
 contrib/src/test/queries/clientpositive/serde_typedbytes4.q     | 1 +
 contrib/src/test/queries/clientpositive/udaf_example_avg.q      | 1 +
 .../src/test/queries/clientpositive/udaf_example_group_concat.q | 1 +
 contrib/src/test/queries/clientpositive/udaf_example_max.q      | 1 +
 contrib/src/test/queries/clientpositive/udaf_example_max_n.q    | 1 +
 contrib/src/test/queries/clientpositive/udaf_example_min.q      | 1 +
 contrib/src/test/queries/clientpositive/udaf_example_min_n.q    | 1 +
 contrib/src/test/queries/clientpositive/udf_row_sequence.q      | 2 +-
 .../java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java   | 4 ++--
 .../hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java  | 1 -
 .../test/java/org/apache/hive/hcatalog/pig/TestHCatLoader.java  | 3 ++-
 .../java/org/apache/hive/hcatalog/pig/TestHCatStorerMulti.java  | 5 ++---
 .../org/apache/hadoop/hive/ql/security/TestExtendedAcls.java    | 2 ++
 .../hadoop/hive/metastore/hbase/HBaseIntegrationTests.java      | 1 +
 .../src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java  | 1 +
 .../hive/ql/security/TestClientSideAuthorizationProvider.java   | 2 +-
 .../apache/hadoop/hive/ql/security/TestFolderPermissions.java   | 1 +
 .../authorization/plugin/TestHiveAuthorizerCheckInvocation.java | 1 +
 .../org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java  | 5 +++--
 .../src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java     | 1 +
 .../hive/service/cli/TestEmbeddedThriftBinaryCLIService.java    | 4 +++-
 ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java      | 1 +
 ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java     | 1 +
 ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java   | 1 +
 .../hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java  | 1 +
 ql/src/test/queries/clientcompare/llap_0.q                      | 2 +-
 ql/src/test/queries/clientnegative/authorization_uri_import.q   | 1 +
 ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q   | 1 +
 ql/src/test/queries/clientnegative/ctasnullcol.q                | 1 +
 ql/src/test/queries/clientnegative/delete_non_acid_table.q      | 1 +
 .../queries/clientnegative/dynamic_partitions_with_whitelist.q  | 1 +
 ql/src/test/queries/clientnegative/index_compact_entry_limit.q  | 1 +
 ql/src/test/queries/clientnegative/index_compact_size_limit.q   | 1 +
 ql/src/test/queries/clientnegative/insert_into6.q               | 1 +
 ql/src/test/queries/clientnegative/insert_into_with_schema.q    | 1 +
 ql/src/test/queries/clientnegative/insert_into_with_schema1.q   | 1 +
 ql/src/test/queries/clientnegative/insert_into_with_schema2.q   | 1 +
 ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q | 1 +
 .../test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q | 1 +
 ql/src/test/queries/clientnegative/join_nonexistent_part.q      | 1 +
 ql/src/test/queries/clientnegative/limit_partition.q            | 1 +
 .../queries/clientnegative/ptf_negative_InvalidValueBoundary.q  | 2 ++
 ql/src/test/queries/clientnegative/serde_regex2.q               | 1 +
 ql/src/test/queries/clientnegative/smb_mapjoin_14.q             | 3 +--
 .../test/queries/clientnegative/stats_partialscan_autogether.q  | 1 +
 ql/src/test/queries/clientnegative/union22.q                    | 1 +
 ql/src/test/queries/clientnegative/update_non_acid_table.q      | 1 +
 ql/src/test/queries/clientpositive/acid_globallimit.q           | 4 ++--
 ql/src/test/queries/clientpositive/acid_join.q                  | 1 +
 ql/src/test/queries/clientpositive/acid_vectorization.q         | 1 +
 .../test/queries/clientpositive/acid_vectorization_partition.q  | 1 +
 ql/src/test/queries/clientpositive/acid_vectorization_project.q | 1 +
 ql/src/test/queries/clientpositive/add_part_multiple.q          | 1 +
 ql/src/test/queries/clientpositive/allcolref_in_udf.q           | 1 +
 ql/src/test/queries/clientpositive/alter_char2.q                | 1 +
 .../queries/clientpositive/alter_concatenate_indexed_table.q    | 1 +
 ql/src/test/queries/clientpositive/alter_merge.q                | 1 +
 ql/src/test/queries/clientpositive/alter_merge_2_orc.q          | 1 +
 ql/src/test/queries/clientpositive/alter_merge_orc.q            | 1 +
 ql/src/test/queries/clientpositive/alter_rename_table.q         | 1 +
 .../clientpositive/alter_table_invalidate_column_stats.q        | 1 +
 ql/src/test/queries/clientpositive/alter_table_partition_drop.q | 1 +
 ql/src/test/queries/clientpositive/alter_varchar2.q             | 1 +
 ql/src/test/queries/clientpositive/alter_view_rename.q          | 1 +
 ql/src/test/queries/clientpositive/analyze_tbl_part.q           | 1 +
 ql/src/test/queries/clientpositive/annotate_stats_filter.q      | 1 +
 ql/src/test/queries/clientpositive/annotate_stats_part.q        | 1 +
 ql/src/test/queries/clientpositive/annotate_stats_select.q      | 1 +
 ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q        | 1 +
 ql/src/test/queries/clientpositive/archive_excludeHadoop20.q    | 1 +
 ql/src/test/queries/clientpositive/archive_multi.q              | 1 +
 .../queries/clientpositive/authorization_create_temp_table.q    | 1 +
 ql/src/test/queries/clientpositive/authorization_explain.q      | 1 +
 ql/src/test/queries/clientpositive/authorization_parts.q        | 1 +
 ql/src/test/queries/clientpositive/auto_join0.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join1.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join10.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join11.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join12.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join13.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join14.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join16.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join17.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join18.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q | 1 +
 ql/src/test/queries/clientpositive/auto_join19.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join2.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join22.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join23.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join24.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join25.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join26.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join27.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join3.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join32.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join33.q                | 1 +
 ql/src/test/queries/clientpositive/auto_join4.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join5.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join6.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join7.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join8.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join9.q                 | 1 +
 ql/src/test/queries/clientpositive/auto_join_filters.q          | 1 +
 ql/src/test/queries/clientpositive/auto_join_nulls.q            | 1 +
 .../test/queries/clientpositive/auto_join_reordering_values.q   | 1 +
 ql/src/test/queries/clientpositive/auto_join_stats2.q           | 1 +
 .../test/queries/clientpositive/auto_join_without_localtask.q   | 1 +
 ql/src/test/queries/clientpositive/auto_smb_mapjoin_14.q        | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q      | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q     | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q     | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q     | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_14.q     | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_15.q     | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q      | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q      | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q      | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q      | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q      | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q      | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q      | 1 +
 ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q      | 1 +
 ql/src/test/queries/clientpositive/autogen_colalias.q           | 1 +
 ql/src/test/queries/clientpositive/avro_add_column3.q           | 1 +
 ql/src/test/queries/clientpositive/avro_date.q                  | 1 +
 ql/src/test/queries/clientpositive/avro_partitioned.q           | 3 ++-
 ql/src/test/queries/clientpositive/avro_partitioned_native.q    | 1 +
 .../test/queries/clientpositive/avro_schema_evolution_native.q  | 1 +
 ql/src/test/queries/clientpositive/avro_timestamp.q             | 1 +
 ql/src/test/queries/clientpositive/bucket6.q                    | 1 +
 ql/src/test/queries/clientpositive/bucket_groupby.q             | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_spark1.q     | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_spark2.q     | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_spark3.q     | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_spark4.q     | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_tez1.q       | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_tez2.q       | 1 +
 ql/src/test/queries/clientpositive/bucketcontext_1.q            | 1 +
 ql/src/test/queries/clientpositive/bucketcontext_2.q            | 1 +
 ql/src/test/queries/clientpositive/bucketcontext_3.q            | 1 +
 ql/src/test/queries/clientpositive/bucketcontext_4.q            | 1 +
 ql/src/test/queries/clientpositive/bucketcontext_6.q            | 1 +
 ql/src/test/queries/clientpositive/bucketcontext_7.q            | 1 +
 ql/src/test/queries/clientpositive/bucketcontext_8.q            | 1 +
 ql/src/test/queries/clientpositive/bucketizedhiveinputformat.q  | 1 +
 .../queries/clientpositive/bucketizedhiveinputformat_auto.q     | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin1.q             | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin13.q            | 3 +--
 ql/src/test/queries/clientpositive/bucketmapjoin2.q             | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin5.q             | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin_negative2.q    | 1 +
 ql/src/test/queries/clientpositive/bucketpruning1.q             | 1 +
 .../test/queries/clientpositive/bucketsortoptimize_insert_2.q   | 1 +
 .../test/queries/clientpositive/bucketsortoptimize_insert_4.q   | 1 +
 .../test/queries/clientpositive/bucketsortoptimize_insert_5.q   | 1 +
 .../test/queries/clientpositive/bucketsortoptimize_insert_6.q   | 1 +
 .../test/queries/clientpositive/bucketsortoptimize_insert_7.q   | 1 +
 .../test/queries/clientpositive/bucketsortoptimize_insert_8.q   | 1 +
 ql/src/test/queries/clientpositive/cast1.q                      | 1 +
 ql/src/test/queries/clientpositive/cbo_gby.q                    | 1 +
 ql/src/test/queries/clientpositive/cbo_gby_empty.q              | 1 +
 ql/src/test/queries/clientpositive/cbo_join.q                   | 1 +
 ql/src/test/queries/clientpositive/cbo_limit.q                  | 1 +
 .../test/queries/clientpositive/cbo_rp_annotate_stats_groupby.q | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q          | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q         | 1 +
 .../test/queries/clientpositive/cbo_rp_cross_product_check_2.q  | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_gby.q                 | 1 +
 .../queries/clientpositive/cbo_rp_gby2_map_multi_distinct.q     | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q           | 1 +
 .../clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q      | 2 +-
 ql/src/test/queries/clientpositive/cbo_rp_join.q                | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_join0.q               | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_join1.q               | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_limit.q               | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_lineage2.q            | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q      | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_semijoin.q            | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_simple_select.q       | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_stats.q               | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_subq_in.q             | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q         | 1 +
 .../queries/clientpositive/cbo_rp_udaf_percentile_approx_23.q   | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_udf_udaf.q            | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_union.q               | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_views.q               | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_windowing.q           | 1 +
 ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q         | 1 +
 ql/src/test/queries/clientpositive/cbo_semijoin.q               | 1 +
 ql/src/test/queries/clientpositive/cbo_simple_select.q          | 1 +
 ql/src/test/queries/clientpositive/cbo_stats.q                  | 1 +
 ql/src/test/queries/clientpositive/cbo_subq_in.q                | 1 +
 ql/src/test/queries/clientpositive/cbo_subq_not_in.q            | 1 +
 ql/src/test/queries/clientpositive/cbo_udf_max.q                | 1 +
 ql/src/test/queries/clientpositive/cbo_udf_udaf.q               | 1 +
 ql/src/test/queries/clientpositive/cbo_union.q                  | 1 +
 ql/src/test/queries/clientpositive/cbo_views.q                  | 1 +
 ql/src/test/queries/clientpositive/cbo_windowing.q              | 1 +
 ql/src/test/queries/clientpositive/column_access_stats.q        | 1 +
 ql/src/test/queries/clientpositive/columnstats_part_coltype.q   | 1 +
 ql/src/test/queries/clientpositive/columnstats_partlvl.q        | 1 +
 ql/src/test/queries/clientpositive/columnstats_partlvl_dp.q     | 1 +
 ql/src/test/queries/clientpositive/combine2.q                   | 1 +
 ql/src/test/queries/clientpositive/complex_alias.q              | 1 +
 .../test/queries/clientpositive/constantPropagateForSubQuery.q  | 1 +
 ql/src/test/queries/clientpositive/constprog2.q                 | 1 +
 ql/src/test/queries/clientpositive/constprog_dpp.q              | 1 +
 ql/src/test/queries/clientpositive/constprog_partitioner.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer1.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer10.q     | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer11.q     | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer13.q     | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer14.q     | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer15.q     | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer2.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer3.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer4.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer5.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer6.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer7.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer8.q      | 1 +
 ql/src/test/queries/clientpositive/correlationoptimizer9.q      | 1 +
 ql/src/test/queries/clientpositive/count.q                      | 1 +
 ql/src/test/queries/clientpositive/cp_sel.q                     | 1 +
 ql/src/test/queries/clientpositive/create_genericudaf.q         | 1 +
 ql/src/test/queries/clientpositive/create_view.q                | 1 +
 ql/src/test/queries/clientpositive/cross_join.q                 | 1 +
 ql/src/test/queries/clientpositive/cross_product_check_1.q      | 1 +
 ql/src/test/queries/clientpositive/cross_product_check_2.q      | 1 +
 ql/src/test/queries/clientpositive/ctas_colname.q               | 1 +
 ql/src/test/queries/clientpositive/database.q                   | 1 +
 ql/src/test/queries/clientpositive/date_2.q                     | 1 +
 ql/src/test/queries/clientpositive/dbtxnmgr_query3.q            | 1 +
 ql/src/test/queries/clientpositive/dbtxnmgr_query4.q            | 1 +
 ql/src/test/queries/clientpositive/decimal_1_1.q                | 1 +
 ql/src/test/queries/clientpositive/decimal_3.q                  | 1 +
 ql/src/test/queries/clientpositive/decimal_4.q                  | 1 +
 ql/src/test/queries/clientpositive/decimal_5.q                  | 1 +
 ql/src/test/queries/clientpositive/decimal_6.q                  | 1 +
 ql/src/test/queries/clientpositive/decimal_join2.q              | 1 +
 ql/src/test/queries/clientpositive/decimal_precision.q          | 1 +
 ql/src/test/queries/clientpositive/decimal_serde.q              | 1 +
 ql/src/test/queries/clientpositive/decimal_trailing.q           | 1 +
 ql/src/test/queries/clientpositive/decimal_udf.q                | 1 +
 ql/src/test/queries/clientpositive/decimal_udf2.q               | 1 +
 ql/src/test/queries/clientpositive/delete_all_non_partitioned.q | 1 +
 ql/src/test/queries/clientpositive/delete_all_partitioned.q     | 1 +
 ql/src/test/queries/clientpositive/delete_tmp_table.q           | 1 +
 ql/src/test/queries/clientpositive/delete_where_no_match.q      | 1 +
 .../test/queries/clientpositive/delete_where_non_partitioned.q  | 1 +
 ql/src/test/queries/clientpositive/delete_where_partitioned.q   | 1 +
 ql/src/test/queries/clientpositive/delete_whole_partition.q     | 1 +
 .../test/queries/clientpositive/disable_merge_for_bucketing.q   | 1 +
 ql/src/test/queries/clientpositive/drop_partition_with_stats.q  | 1 +
 ql/src/test/queries/clientpositive/dynamic_partition_insert.q   | 1 +
 ql/src/test/queries/clientpositive/dynamic_partition_pruning.q  | 1 +
 ql/src/test/queries/clientpositive/dynamic_rdd_cache.q          | 1 +
 ql/src/test/queries/clientpositive/dynpart_merge.q              | 1 +
 ql/src/test/queries/clientpositive/dynpart_sort_opt_bucketing.q | 1 +
 .../queries/clientpositive/dynpart_sort_opt_vectorization.q     | 1 +
 ql/src/test/queries/clientpositive/dynpart_sort_optimization.q  | 1 +
 ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q | 1 +
 .../queries/clientpositive/dynpart_sort_optimization_acid.q     | 1 +
 ql/src/test/queries/clientpositive/empty_dir_in_table.q         | 1 +
 ql/src/test/queries/clientpositive/encryption_drop_partition.q  | 2 +-
 .../clientpositive/encryption_insert_partition_dynamic.q        | 3 ++-
 .../queries/clientpositive/encryption_insert_partition_static.q | 2 +-
 .../queries/clientpositive/encryption_join_unencrypted_tbl.q    | 4 ++--
 .../encryption_join_with_different_encryption_keys.q            | 4 ++--
 ql/src/test/queries/clientpositive/escape1.q                    | 1 +
 ql/src/test/queries/clientpositive/escape2.q                    | 1 +
 ql/src/test/queries/clientpositive/escape_orderby1.q            | 1 +
 ql/src/test/queries/clientpositive/exchgpartition2lel.q         | 2 +-
 ql/src/test/queries/clientpositive/exim_02_00_part_empty.q      | 1 +
 ql/src/test/queries/clientpositive/exim_02_part.q               | 1 +
 ql/src/test/queries/clientpositive/exim_04_all_part.q           | 1 +
 ql/src/test/queries/clientpositive/exim_04_evolved_parts.q      | 1 +
 ql/src/test/queries/clientpositive/exim_05_some_part.q          | 1 +
 ql/src/test/queries/clientpositive/exim_06_one_part.q           | 1 +
 .../queries/clientpositive/exim_07_all_part_over_nonoverlap.q   | 1 +
 .../test/queries/clientpositive/exim_09_part_spec_nonoverlap.q  | 1 +
 ql/src/test/queries/clientpositive/exim_15_external_part.q      | 1 +
 ql/src/test/queries/clientpositive/exim_16_part_external.q      | 1 +
 ql/src/test/queries/clientpositive/exim_17_part_managed.q       | 1 +
 ql/src/test/queries/clientpositive/exim_18_part_external.q      | 1 +
 .../queries/clientpositive/exim_19_00_part_external_location.q  | 1 +
 .../queries/clientpositive/exim_19_part_external_location.q     | 1 +
 .../test/queries/clientpositive/exim_20_part_managed_location.q | 1 +
 .../queries/clientpositive/exim_23_import_part_authsuccess.q    | 1 +
 ql/src/test/queries/clientpositive/exim_hidden_files.q          | 1 +
 ql/src/test/queries/clientpositive/explain_dependency.q         | 1 +
 ql/src/test/queries/clientpositive/explain_logical.q            | 1 +
 ql/src/test/queries/clientpositive/explain_rearrange.q          | 1 +
 ql/src/test/queries/clientpositive/explainuser_1.q              | 1 +
 ql/src/test/queries/clientpositive/explainuser_3.q              | 1 +
 .../clientpositive/external_table_with_space_in_location_path.q | 1 +
 .../test/queries/clientpositive/extrapolate_part_stats_full.q   | 1 +
 .../queries/clientpositive/extrapolate_part_stats_partial.q     | 1 +
 .../queries/clientpositive/extrapolate_part_stats_partial_ndv.q | 1 +
 ql/src/test/queries/clientpositive/file_with_header_footer.q    | 1 +
 ql/src/test/queries/clientpositive/fileformat_mix.q             | 1 +
 ql/src/test/queries/clientpositive/filter_cond_pushdown.q       | 1 +
 ql/src/test/queries/clientpositive/filter_join_breaktask.q      | 1 +
 ql/src/test/queries/clientpositive/filter_join_breaktask2.q     | 1 +
 ql/src/test/queries/clientpositive/fold_eq_with_case_when.q     | 1 +
 ql/src/test/queries/clientpositive/fouter_join_ppr.q            | 1 +
 ql/src/test/queries/clientpositive/gby_star.q                   | 1 +
 ql/src/test/queries/clientpositive/global_limit.q               | 1 +
 ql/src/test/queries/clientpositive/groupby1.q                   | 1 +
 ql/src/test/queries/clientpositive/groupby11.q                  | 1 +
 ql/src/test/queries/clientpositive/groupby1_limit.q             | 1 +
 ql/src/test/queries/clientpositive/groupby1_map.q               | 1 +
 ql/src/test/queries/clientpositive/groupby1_map_nomap.q         | 1 +
 ql/src/test/queries/clientpositive/groupby1_map_skew.q          | 1 +
 ql/src/test/queries/clientpositive/groupby1_noskew.q            | 1 +
 ql/src/test/queries/clientpositive/groupby2.q                   | 1 +
 ql/src/test/queries/clientpositive/groupby2_limit.q             | 1 +
 ql/src/test/queries/clientpositive/groupby2_map.q               | 1 +
 .../test/queries/clientpositive/groupby2_map_multi_distinct.q   | 1 +
 ql/src/test/queries/clientpositive/groupby2_map_skew.q          | 1 +
 ql/src/test/queries/clientpositive/groupby2_noskew.q            | 1 +
 .../queries/clientpositive/groupby2_noskew_multi_distinct.q     | 1 +
 ql/src/test/queries/clientpositive/groupby3.q                   | 1 +
 ql/src/test/queries/clientpositive/groupby3_map.q               | 1 +
 .../test/queries/clientpositive/groupby3_map_multi_distinct.q   | 1 +
 ql/src/test/queries/clientpositive/groupby3_map_skew.q          | 1 +
 ql/src/test/queries/clientpositive/groupby3_noskew.q            | 1 +
 .../queries/clientpositive/groupby3_noskew_multi_distinct.q     | 1 +
 ql/src/test/queries/clientpositive/groupby4.q                   | 1 +
 ql/src/test/queries/clientpositive/groupby4_map.q               | 1 +
 ql/src/test/queries/clientpositive/groupby4_map_skew.q          | 1 +
 ql/src/test/queries/clientpositive/groupby4_noskew.q            | 1 +
 ql/src/test/queries/clientpositive/groupby5.q                   | 1 +
 ql/src/test/queries/clientpositive/groupby5_noskew.q            | 1 +
 ql/src/test/queries/clientpositive/groupby6.q                   | 1 +
 ql/src/test/queries/clientpositive/groupby6_map.q               | 1 +
 ql/src/test/queries/clientpositive/groupby6_map_skew.q          | 1 +
 ql/src/test/queries/clientpositive/groupby6_noskew.q            | 1 +
 ql/src/test/queries/clientpositive/groupby_cube1.q              | 1 +
 ql/src/test/queries/clientpositive/groupby_distinct_samekey.q   | 1 +
 ql/src/test/queries/clientpositive/groupby_grouping_sets2.q     | 1 +
 ql/src/test/queries/clientpositive/groupby_grouping_sets4.q     | 1 +
 ql/src/test/queries/clientpositive/groupby_grouping_sets5.q     | 1 +
 ql/src/test/queries/clientpositive/groupby_grouping_sets6.q     | 1 +
 ql/src/test/queries/clientpositive/groupby_join_pushdown.q      | 1 +
 ql/src/test/queries/clientpositive/groupby_map_ppr.q            | 1 +
 .../queries/clientpositive/groupby_map_ppr_multi_distinct.q     | 1 +
 ql/src/test/queries/clientpositive/groupby_position.q           | 1 +
 ql/src/test/queries/clientpositive/groupby_ppd.q                | 1 +
 ql/src/test/queries/clientpositive/groupby_ppr.q                | 1 +
 ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q | 1 +
 ql/src/test/queries/clientpositive/groupby_resolution.q         | 1 +
 ql/src/test/queries/clientpositive/groupby_rollup1.q            | 1 +
 ql/src/test/queries/clientpositive/groupby_sort_10.q            | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_11.q            | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_1_23.q          | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_2.q             | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_3.q             | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_4.q             | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_5.q             | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_6.q             | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_7.q             | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_8.q             | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_9.q             | 5 ++---
 ql/src/test/queries/clientpositive/groupby_sort_skew_1_23.q     | 3 +--
 ql/src/test/queries/clientpositive/groupby_sort_test_1.q        | 3 +--
 ql/src/test/queries/clientpositive/having.q                     | 1 +
 ql/src/test/queries/clientpositive/having2.q                    | 1 +
 ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q     | 1 +
 ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q     | 1 +
 .../test/queries/clientpositive/implicit_cast_during_insert.q   | 1 +
 ql/src/test/queries/clientpositive/index_auto.q                 | 1 +
 ql/src/test/queries/clientpositive/index_auto_empty.q           | 1 +
 ql/src/test/queries/clientpositive/index_auto_file_format.q     | 1 +
 ql/src/test/queries/clientpositive/index_auto_mult_tables.q     | 1 +
 .../queries/clientpositive/index_auto_mult_tables_compact.q     | 1 +
 ql/src/test/queries/clientpositive/index_auto_multiple.q        | 1 +
 ql/src/test/queries/clientpositive/index_auto_partitioned.q     | 1 +
 ql/src/test/queries/clientpositive/index_auto_self_join.q       | 1 +
 ql/src/test/queries/clientpositive/index_auto_unused.q          | 1 +
 ql/src/test/queries/clientpositive/index_auto_update.q          | 1 +
 ql/src/test/queries/clientpositive/index_bitmap.q               | 1 +
 ql/src/test/queries/clientpositive/index_bitmap3.q              | 1 +
 ql/src/test/queries/clientpositive/index_bitmap_auto.q          | 1 +
 .../test/queries/clientpositive/index_bitmap_auto_partitioned.q | 1 +
 ql/src/test/queries/clientpositive/index_bitmap_compression.q   | 1 +
 ql/src/test/queries/clientpositive/index_bitmap_rc.q            | 1 +
 ql/src/test/queries/clientpositive/index_compact.q              | 1 +
 ql/src/test/queries/clientpositive/index_compact_2.q            | 1 +
 ql/src/test/queries/clientpositive/index_compression.q          | 1 +
 ql/src/test/queries/clientpositive/index_skewtable.q            | 1 +
 ql/src/test/queries/clientpositive/index_stale.q                | 1 +
 ql/src/test/queries/clientpositive/index_stale_partitioned.q    | 1 +
 ql/src/test/queries/clientpositive/infer_bucket_sort.q          | 1 +
 .../queries/clientpositive/infer_bucket_sort_convert_join.q     | 1 +
 ql/src/test/queries/clientpositive/infer_bucket_sort_dyn_part.q | 1 +
 .../clientpositive/infer_bucket_sort_grouping_operators.q       | 1 +
 .../queries/clientpositive/infer_bucket_sort_map_operators.q    | 1 +
 ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q    | 1 +
 .../clientpositive/infer_bucket_sort_reducers_power_two.q       | 1 +
 ql/src/test/queries/clientpositive/infer_const_type.q           | 1 +
 ql/src/test/queries/clientpositive/innerjoin.q                  | 1 +
 ql/src/test/queries/clientpositive/input11.q                    | 1 +
 ql/src/test/queries/clientpositive/input11_limit.q              | 1 +
 ql/src/test/queries/clientpositive/input12.q                    | 1 +
 ql/src/test/queries/clientpositive/input13.q                    | 1 +
 ql/src/test/queries/clientpositive/input23.q                    | 1 +
 ql/src/test/queries/clientpositive/input26.q                    | 1 +
 ql/src/test/queries/clientpositive/input28.q                    | 1 +
 ql/src/test/queries/clientpositive/input2_limit.q               | 1 +
 ql/src/test/queries/clientpositive/input30.q                    | 1 +
 ql/src/test/queries/clientpositive/input31.q                    | 1 +
 ql/src/test/queries/clientpositive/input32.q                    | 1 +
 ql/src/test/queries/clientpositive/input42.q                    | 1 +
 ql/src/test/queries/clientpositive/input8.q                     | 1 +
 ql/src/test/queries/clientpositive/input_part1.q                | 1 +
 ql/src/test/queries/clientpositive/input_part4.q                | 1 +
 ql/src/test/queries/clientpositive/input_part5.q                | 1 +
 ql/src/test/queries/clientpositive/input_part6.q                | 1 +
 ql/src/test/queries/clientpositive/input_part9.q                | 1 +
 ql/src/test/queries/clientpositive/insert0.q                    | 1 +
 .../test/queries/clientpositive/insert1_overwrite_partitions.q  | 1 +
 .../test/queries/clientpositive/insert2_overwrite_partitions.q  | 1 +
 .../test/queries/clientpositive/insert_acid_dynamic_partition.q | 1 +
 ql/src/test/queries/clientpositive/insert_into2.q               | 1 +
 ql/src/test/queries/clientpositive/insert_into5.q               | 1 +
 ql/src/test/queries/clientpositive/insert_into6.q               | 1 +
 ql/src/test/queries/clientpositive/insert_into_with_schema.q    | 1 +
 ql/src/test/queries/clientpositive/insert_into_with_schema2.q   | 1 +
 ql/src/test/queries/clientpositive/insert_update_delete.q       | 1 +
 .../queries/clientpositive/insert_values_dynamic_partitioned.q  | 1 +
 .../test/queries/clientpositive/insert_values_non_partitioned.q | 1 +
 ql/src/test/queries/clientpositive/insert_values_partitioned.q  | 1 +
 ql/src/test/queries/clientpositive/insert_values_tmp_table.q    | 1 +
 ql/src/test/queries/clientpositive/interval_3.q                 | 1 +
 ql/src/test/queries/clientpositive/join0.q                      | 1 +
 ql/src/test/queries/clientpositive/join1.q                      | 1 +
 ql/src/test/queries/clientpositive/join10.q                     | 1 +
 ql/src/test/queries/clientpositive/join11.q                     | 1 +
 ql/src/test/queries/clientpositive/join12.q                     | 1 +
 ql/src/test/queries/clientpositive/join13.q                     | 1 +
 ql/src/test/queries/clientpositive/join14.q                     | 1 +
 ql/src/test/queries/clientpositive/join16.q                     | 1 +
 ql/src/test/queries/clientpositive/join17.q                     | 1 +
 ql/src/test/queries/clientpositive/join18.q                     | 1 +
 ql/src/test/queries/clientpositive/join19.q                     | 1 +
 ql/src/test/queries/clientpositive/join2.q                      | 1 +
 ql/src/test/queries/clientpositive/join22.q                     | 1 +
 ql/src/test/queries/clientpositive/join23.q                     | 1 +
 ql/src/test/queries/clientpositive/join28.q                     | 1 +
 ql/src/test/queries/clientpositive/join29.q                     | 1 +
 ql/src/test/queries/clientpositive/join3.q                      | 1 +
 ql/src/test/queries/clientpositive/join31.q                     | 1 +
 ql/src/test/queries/clientpositive/join32.q                     | 1 +
 ql/src/test/queries/clientpositive/join32_lessSize.q            | 1 +
 ql/src/test/queries/clientpositive/join33.q                     | 1 +
 ql/src/test/queries/clientpositive/join34.q                     | 1 +
 ql/src/test/queries/clientpositive/join35.q                     | 1 +
 ql/src/test/queries/clientpositive/join4.q                      | 1 +
 ql/src/test/queries/clientpositive/join40.q                     | 1 +
 ql/src/test/queries/clientpositive/join41.q                     | 1 +
 ql/src/test/queries/clientpositive/join42.q                     | 1 +
 ql/src/test/queries/clientpositive/join43.q                     | 1 +
 ql/src/test/queries/clientpositive/join5.q                      | 1 +
 ql/src/test/queries/clientpositive/join6.q                      | 1 +
 ql/src/test/queries/clientpositive/join7.q                      | 1 +
 ql/src/test/queries/clientpositive/join8.q                      | 1 +
 ql/src/test/queries/clientpositive/join9.q                      | 1 +
 ql/src/test/queries/clientpositive/join_acid_non_acid.q         | 1 +
 ql/src/test/queries/clientpositive/join_alt_syntax.q            | 1 +
 ql/src/test/queries/clientpositive/join_cond_pushdown_1.q       | 1 +
 ql/src/test/queries/clientpositive/join_cond_pushdown_2.q       | 1 +
 ql/src/test/queries/clientpositive/join_cond_pushdown_3.q       | 1 +
 ql/src/test/queries/clientpositive/join_cond_pushdown_4.q       | 1 +
 ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q | 1 +
 ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q | 1 +
 ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q | 1 +
 ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q | 1 +
 ql/src/test/queries/clientpositive/join_empty.q                 | 1 +
 ql/src/test/queries/clientpositive/join_filters.q               | 1 +
 ql/src/test/queries/clientpositive/join_filters_overlap.q       | 1 +
 ql/src/test/queries/clientpositive/join_grp_diff_keys.q         | 1 +
 ql/src/test/queries/clientpositive/join_hive_626.q              | 1 +
 ql/src/test/queries/clientpositive/join_literals.q              | 1 +
 .../test/queries/clientpositive/join_merge_multi_expressions.q  | 1 +
 ql/src/test/queries/clientpositive/join_merging.q               | 1 +
 ql/src/test/queries/clientpositive/join_nulls.q                 | 1 +
 ql/src/test/queries/clientpositive/join_on_varchar.q            | 1 +
 ql/src/test/queries/clientpositive/join_parse.q                 | 1 +
 ql/src/test/queries/clientpositive/join_rc.q                    | 1 +
 ql/src/test/queries/clientpositive/join_reorder.q               | 1 +
 ql/src/test/queries/clientpositive/join_star.q                  | 1 +
 ql/src/test/queries/clientpositive/join_vc.q                    | 1 +
 ql/src/test/queries/clientpositive/leftsemijoin.q               | 1 +
 ql/src/test/queries/clientpositive/limit_join_transpose.q       | 1 +
 .../test/queries/clientpositive/limit_partition_metadataonly.q  | 1 +
 ql/src/test/queries/clientpositive/limit_pushdown.q             | 1 +
 ql/src/test/queries/clientpositive/limit_pushdown_negative.q    | 1 +
 ql/src/test/queries/clientpositive/lineage1.q                   | 1 +
 ql/src/test/queries/clientpositive/lineage2.q                   | 1 +
 ql/src/test/queries/clientpositive/lineage3.q                   | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_1.q          | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_11.q         | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_12.q         | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_13.q         | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_2.q          | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_3.q          | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_4.q          | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_5.q          | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_6.q          | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_7.q          | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_8.q          | 1 +
 ql/src/test/queries/clientpositive/list_bucket_dml_9.q          | 1 +
 .../test/queries/clientpositive/list_bucket_query_multiskew_1.q | 1 +
 .../test/queries/clientpositive/list_bucket_query_multiskew_2.q | 1 +
 .../test/queries/clientpositive/list_bucket_query_multiskew_3.q | 1 +
 .../test/queries/clientpositive/list_bucket_query_oneskew_1.q   | 1 +
 .../test/queries/clientpositive/list_bucket_query_oneskew_2.q   | 1 +
 .../test/queries/clientpositive/list_bucket_query_oneskew_3.q   | 1 +
 ql/src/test/queries/clientpositive/llap_partitioned.q           | 1 +
 ql/src/test/queries/clientpositive/llapdecider.q                | 1 +
 ql/src/test/queries/clientpositive/load_dyn_part13.q            | 1 +
 ql/src/test/queries/clientpositive/louter_join_ppr.q            | 1 +
 ql/src/test/queries/clientpositive/macro_duplicate.q            | 1 +
 ql/src/test/queries/clientpositive/mapjoin_decimal.q            | 1 +
 ql/src/test/queries/clientpositive/mapjoin_mapjoin.q            | 1 +
 ql/src/test/queries/clientpositive/mapjoin_memcheck.q           | 1 +
 ql/src/test/queries/clientpositive/mapjoin_subquery.q           | 1 +
 ql/src/test/queries/clientpositive/mapjoin_subquery2.q          | 1 +
 ql/src/test/queries/clientpositive/mapreduce2.q                 | 1 +
 ql/src/test/queries/clientpositive/merge1.q                     | 1 +
 ql/src/test/queries/clientpositive/merge2.q                     | 1 +
 ql/src/test/queries/clientpositive/merge3.q                     | 1 +
 ql/src/test/queries/clientpositive/merge4.q                     | 1 +
 ql/src/test/queries/clientpositive/merge_dynamic_partition.q    | 1 +
 ql/src/test/queries/clientpositive/merge_dynamic_partition4.q   | 1 +
 ql/src/test/queries/clientpositive/merge_dynamic_partition5.q   | 1 +
 ql/src/test/queries/clientpositive/mergejoin.q                  | 1 +
 ql/src/test/queries/clientpositive/mergejoins.q                 | 1 +
 ql/src/test/queries/clientpositive/mergejoins_mixed.q           | 1 +
 ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q      | 1 +
 ql/src/test/queries/clientpositive/metadata_only_queries.q      | 1 +
 ql/src/test/queries/clientpositive/metadataonly1.q              | 1 +
 ql/src/test/queries/clientpositive/mi.q                         | 1 +
 ql/src/test/queries/clientpositive/mrr.q                        | 1 +
 ql/src/test/queries/clientpositive/multiMapJoin1.q              | 1 +
 ql/src/test/queries/clientpositive/multiMapJoin2.q              | 1 +
 ql/src/test/queries/clientpositive/multi_column_in.q            | 1 +
 ql/src/test/queries/clientpositive/multi_insert_gby2.q          | 1 +
 ql/src/test/queries/clientpositive/multi_insert_gby3.q          | 1 +
 ql/src/test/queries/clientpositive/multi_insert_mixed.q         | 1 +
 ql/src/test/queries/clientpositive/multi_insert_union_src.q     | 1 +
 ql/src/test/queries/clientpositive/multi_join_union.q           | 1 +
 ql/src/test/queries/clientpositive/newline.q                    | 1 +
 ql/src/test/queries/clientpositive/no_hooks.q                   | 1 +
 ql/src/test/queries/clientpositive/noalias_subq1.q              | 1 +
 ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q    | 1 +
 ql/src/test/queries/clientpositive/nonmr_fetch.q                | 1 +
 ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q      | 2 +-
 ql/src/test/queries/clientpositive/notable_alias1.q             | 1 +
 ql/src/test/queries/clientpositive/notable_alias2.q             | 1 +
 ql/src/test/queries/clientpositive/nullgroup.q                  | 1 +
 ql/src/test/queries/clientpositive/nullgroup2.q                 | 1 +
 ql/src/test/queries/clientpositive/nullgroup3.q                 | 1 +
 ql/src/test/queries/clientpositive/nullgroup4.q                 | 1 +
 ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q  | 1 +
 ql/src/test/queries/clientpositive/optimize_nullscan.q          | 1 +
 ql/src/test/queries/clientpositive/optional_outer.q             | 1 +
 ql/src/test/queries/clientpositive/orc_analyze.q                | 1 +
 ql/src/test/queries/clientpositive/orc_create.q                 | 1 +
 ql/src/test/queries/clientpositive/orc_createas1.q              | 1 +
 ql/src/test/queries/clientpositive/orc_diff_part_cols.q         | 1 +
 ql/src/test/queries/clientpositive/orc_file_dump.q              | 1 +
 ql/src/test/queries/clientpositive/orc_int_type_promotion.q     | 1 +
 ql/src/test/queries/clientpositive/orc_llap.q                   | 1 +
 ql/src/test/queries/clientpositive/orc_merge1.q                 | 1 +
 ql/src/test/queries/clientpositive/orc_merge10.q                | 1 +
 ql/src/test/queries/clientpositive/orc_merge2.q                 | 1 +
 ql/src/test/queries/clientpositive/orc_merge3.q                 | 1 +
 ql/src/test/queries/clientpositive/orc_merge4.q                 | 1 +
 ql/src/test/queries/clientpositive/orc_merge_diff_fs.q          | 1 +
 ql/src/test/queries/clientpositive/orc_merge_incompat2.q        | 1 +
 ql/src/test/queries/clientpositive/orc_ppd_basic.q              | 1 +
 ql/src/test/queries/clientpositive/orc_ppd_char.q               | 1 +
 ql/src/test/queries/clientpositive/orc_predicate_pushdown.q     | 1 +
 ql/src/test/queries/clientpositive/orc_vectorization_ppd.q      | 1 +
 ql/src/test/queries/clientpositive/orc_wide_table.q             | 1 +
 ql/src/test/queries/clientpositive/order2.q                     | 1 +
 ql/src/test/queries/clientpositive/outer_join_ppr.q             | 1 +
 ql/src/test/queries/clientpositive/parallel_join0.q             | 1 +
 ql/src/test/queries/clientpositive/parallel_join1.q             | 1 +
 ql/src/test/queries/clientpositive/parallel_orderby.q           | 1 +
 ql/src/test/queries/clientpositive/parenthesis_star_by.q        | 1 +
 ql/src/test/queries/clientpositive/parquet_ctas.q               | 1 +
 ql/src/test/queries/clientpositive/parquet_decimal.q            | 1 +
 ql/src/test/queries/clientpositive/parquet_join.q               | 1 +
 .../queries/clientpositive/parquet_mixed_partition_formats.q    | 1 +
 .../queries/clientpositive/parquet_mixed_partition_formats2.q   | 1 +
 ql/src/test/queries/clientpositive/parquet_partitioned.q        | 1 +
 ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q | 1 +
 ql/src/test/queries/clientpositive/parquet_schema_evolution.q   | 1 +
 ql/src/test/queries/clientpositive/parquet_serde.q              | 1 +
 ql/src/test/queries/clientpositive/parquet_types.q              | 1 +
 ql/src/test/queries/clientpositive/partInit.q                   | 1 +
 ql/src/test/queries/clientpositive/partition_boolexpr.q         | 1 +
 ql/src/test/queries/clientpositive/partition_char.q             | 1 +
 ql/src/test/queries/clientpositive/partition_date.q             | 1 +
 ql/src/test/queries/clientpositive/partition_date2.q            | 1 +
 ql/src/test/queries/clientpositive/partition_multilevels.q      | 1 +
 ql/src/test/queries/clientpositive/partition_timestamp.q        | 1 +
 ql/src/test/queries/clientpositive/partition_timestamp2.q       | 1 +
 ql/src/test/queries/clientpositive/partition_type_check.q       | 1 +
 ql/src/test/queries/clientpositive/partition_varchar1.q         | 1 +
 .../test/queries/clientpositive/partition_vs_table_metadata.q   | 1 +
 ql/src/test/queries/clientpositive/partition_wise_fileformat.q  | 1 +
 .../test/queries/clientpositive/partition_wise_fileformat13.q   | 4 +++-
 .../test/queries/clientpositive/partition_wise_fileformat14.q   | 3 +--
 .../test/queries/clientpositive/partition_wise_fileformat17.q   | 1 +
 .../test/queries/clientpositive/partition_wise_fileformat18.q   | 1 +
 ql/src/test/queries/clientpositive/partition_wise_fileformat2.q | 1 +
 ql/src/test/queries/clientpositive/pcr.q                        | 1 +
 ql/src/test/queries/clientpositive/pcs.q                        | 1 +
 ql/src/test/queries/clientpositive/pointlookup2.q               | 1 +
 ql/src/test/queries/clientpositive/pointlookup3.q               | 1 +
 ql/src/test/queries/clientpositive/pointlookup4.q               | 1 +
 ql/src/test/queries/clientpositive/ppd2.q                       | 1 +
 ql/src/test/queries/clientpositive/ppd_constant_expr.q          | 1 +
 ql/src/test/queries/clientpositive/ppd_gby.q                    | 1 +
 ql/src/test/queries/clientpositive/ppd_gby2.q                   | 1 +
 ql/src/test/queries/clientpositive/ppd_gby_join.q               | 1 +
 ql/src/test/queries/clientpositive/ppd_join.q                   | 1 +
 ql/src/test/queries/clientpositive/ppd_join2.q                  | 1 +
 ql/src/test/queries/clientpositive/ppd_join3.q                  | 1 +
 ql/src/test/queries/clientpositive/ppd_join5.q                  | 1 +
 ql/src/test/queries/clientpositive/ppd_join_filter.q            | 1 +
 ql/src/test/queries/clientpositive/ppd_multi_insert.q           | 1 +
 ql/src/test/queries/clientpositive/ppd_outer_join1.q            | 1 +
 ql/src/test/queries/clientpositive/ppd_outer_join2.q            | 1 +
 ql/src/test/queries/clientpositive/ppd_outer_join3.q            | 1 +
 ql/src/test/queries/clientpositive/ppd_outer_join4.q            | 1 +
 ql/src/test/queries/clientpositive/ppd_outer_join5.q            | 1 +
 ql/src/test/queries/clientpositive/ppd_random.q                 | 1 +
 ql/src/test/queries/clientpositive/ppd_repeated_alias.q         | 1 +
 ql/src/test/queries/clientpositive/ppd_udf_case.q               | 1 +
 ql/src/test/queries/clientpositive/ppd_udf_col.q                | 1 +
 ql/src/test/queries/clientpositive/ppd_union.q                  | 1 +
 ql/src/test/queries/clientpositive/ppd_union_view.q             | 1 +
 ql/src/test/queries/clientpositive/ppd_vc.q                     | 1 +
 ql/src/test/queries/clientpositive/ppr_allchildsarenull.q       | 1 +
 ql/src/test/queries/clientpositive/ppr_pushdown.q               | 1 +
 ql/src/test/queries/clientpositive/print_header.q               | 1 +
 ql/src/test/queries/clientpositive/ptfgroupbyjoin.q             | 1 +
 ql/src/test/queries/clientpositive/push_or.q                    | 1 +
 ql/src/test/queries/clientpositive/quote1.q                     | 1 +
 ql/src/test/queries/clientpositive/quotedid_basic.q             | 1 +
 ql/src/test/queries/clientpositive/quotedid_partition.q         | 1 +
 ql/src/test/queries/clientpositive/quotedid_skew.q              | 1 +
 ql/src/test/queries/clientpositive/rand_partitionpruner3.q      | 1 +
 ql/src/test/queries/clientpositive/rcfile_columnar.q            | 1 +
 ql/src/test/queries/clientpositive/rcfile_createas1.q           | 1 +
 ql/src/test/queries/clientpositive/rcfile_lazydecompress.q      | 1 +
 ql/src/test/queries/clientpositive/rcfile_merge2.q              | 1 +
 ql/src/test/queries/clientpositive/rcfile_merge3.q              | 1 +
 ql/src/test/queries/clientpositive/rcfile_merge4.q              | 1 +
 ql/src/test/queries/clientpositive/rcfile_null_value.q          | 1 +
 ql/src/test/queries/clientpositive/rcfile_toleratecorruptions.q | 1 +
 ql/src/test/queries/clientpositive/rcfile_union.q               | 1 +
 .../test/queries/clientpositive/reduce_deduplicate_extended.q   | 1 +
 ql/src/test/queries/clientpositive/regex_col.q                  | 1 +
 ql/src/test/queries/clientpositive/remote_script.q              | 1 +
 .../queries/clientpositive/rename_external_partition_location.q | 1 +
 ql/src/test/queries/clientpositive/repl_2_exim_basic.q          | 1 +
 ql/src/test/queries/clientpositive/repl_3_exim_metadata.q       | 1 +
 ql/src/test/queries/clientpositive/root_dir_external_table.q    | 1 +
 ql/src/test/queries/clientpositive/router_join_ppr.q            | 1 +
 .../queries/clientpositive/runtime_skewjoin_mapjoin_spark.q     | 1 +
 ql/src/test/queries/clientpositive/sample10.q                   | 1 +
 ql/src/test/queries/clientpositive/sample6.q                    | 1 +
 ql/src/test/queries/clientpositive/sample8.q                    | 1 +
 ql/src/test/queries/clientpositive/sample_islocalmode_hook.q    | 1 +
 .../queries/clientpositive/schema_evol_orc_acid_mapwork_part.q  | 1 +
 .../clientpositive/schema_evol_orc_acidvec_mapwork_part.q       | 1 +
 .../clientpositive/schema_evol_orc_nonvec_fetchwork_part.q      | 1 +
 .../clientpositive/schema_evol_orc_nonvec_mapwork_part.q        | 1 +
 .../queries/clientpositive/schema_evol_orc_vec_mapwork_part.q   | 1 +
 .../clientpositive/schema_evol_text_nonvec_fetchwork_part.q     | 1 +
 .../clientpositive/schema_evol_text_nonvec_mapwork_part.q       | 1 +
 ql/src/test/queries/clientpositive/schemeAuthority.q            | 1 +
 ql/src/test/queries/clientpositive/schemeAuthority2.q           | 1 +
 ql/src/test/queries/clientpositive/selectDistinctStar.q         | 1 +
 ql/src/test/queries/clientpositive/select_same_col.q            | 1 +
 ql/src/test/queries/clientpositive/select_unquote_and.q         | 1 +
 ql/src/test/queries/clientpositive/select_unquote_not.q         | 1 +
 ql/src/test/queries/clientpositive/select_unquote_or.q          | 1 +
 ql/src/test/queries/clientpositive/semijoin.q                   | 1 +
 ql/src/test/queries/clientpositive/serde_regex.q                | 1 +
 ql/src/test/queries/clientpositive/set_processor_namespaces.q   | 1 +
 ql/src/test/queries/clientpositive/skewjoin.q                   | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q         | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q         | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q          | 1 +
 ql/src/test/queries/clientpositive/skewjoin_noskew.q            | 1 +
 ql/src/test/queries/clientpositive/skewjoin_onesideskew.q       | 2 +-
 ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q    | 1 +
 ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q    | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt1.q               | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt10.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt11.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt12.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt13.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt14.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt15.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt16.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt17.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt18.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt19.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt2.q               | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt20.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt21.q              | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt3.q               | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt4.q               | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt5.q               | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt6.q               | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt7.q               | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt8.q               | 1 +
 ql/src/test/queries/clientpositive/skewjoinopt9.q               | 1 +
 ql/src/test/queries/clientpositive/smb_join_partition_key.q     | 1 +
 ql/src/test/queries/clientpositive/smb_mapjoin_11.q             | 1 +
 ql/src/test/queries/clientpositive/smb_mapjoin_14.q             | 3 +--
 ql/src/test/queries/clientpositive/smb_mapjoin_17.q             | 1 +
 ql/src/test/queries/clientpositive/smb_mapjoin_25.q             | 1 +
 ql/src/test/queries/clientpositive/smb_mapjoin_6.q              | 3 +--
 ql/src/test/queries/clientpositive/smb_mapjoin_7.q              | 3 +--
 ql/src/test/queries/clientpositive/stats1.q                     | 1 +
 ql/src/test/queries/clientpositive/stats10.q                    | 1 +
 ql/src/test/queries/clientpositive/stats3.q                     | 1 +
 ql/src/test/queries/clientpositive/stats_only_null.q            | 1 +
 ql/src/test/queries/clientpositive/stats_ppr_all.q              | 1 +
 ql/src/test/queries/clientpositive/storage_format_descriptor.q  | 1 +
 ql/src/test/queries/clientpositive/str_to_map.q                 | 1 +
 ql/src/test/queries/clientpositive/subq.q                       | 1 +
 ql/src/test/queries/clientpositive/subq2.q                      | 1 +
 ql/src/test/queries/clientpositive/subq_where_serialization.q   | 1 +
 ql/src/test/queries/clientpositive/subquery_alias.q             | 1 +
 ql/src/test/queries/clientpositive/subquery_exists.q            | 1 +
 ql/src/test/queries/clientpositive/subquery_exists_having.q     | 1 +
 ql/src/test/queries/clientpositive/subquery_in.q                | 1 +
 ql/src/test/queries/clientpositive/subquery_in_having.q         | 1 +
 ql/src/test/queries/clientpositive/subquery_multiinsert.q       | 1 +
 ql/src/test/queries/clientpositive/subquery_notexists.q         | 1 +
 ql/src/test/queries/clientpositive/subquery_notexists_having.q  | 1 +
 ql/src/test/queries/clientpositive/subquery_notin.q             | 1 +
 ql/src/test/queries/clientpositive/subquery_notin_having.q      | 1 +
 ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q  | 1 +
 ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q  | 1 +
 ql/src/test/queries/clientpositive/subquery_views.q             | 1 +
 ql/src/test/queries/clientpositive/sum_expr_with_order.q        | 1 +
 ql/src/test/queries/clientpositive/symlink_text_input_format.q  | 1 +
 ql/src/test/queries/clientpositive/table_access_keys_stats.q    | 1 +
 ql/src/test/queries/clientpositive/table_nonprintable.q         | 2 +-
 ql/src/test/queries/clientpositive/tablename_with_select.q      | 1 +
 ql/src/test/queries/clientpositive/temp_table.q                 | 1 +
 ql/src/test/queries/clientpositive/temp_table_join1.q           | 1 +
 ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q   | 1 +
 ql/src/test/queries/clientpositive/tez_dml.q                    | 1 +
 ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q     | 1 +
 ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q     | 1 +
 ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q     | 2 +-
 ql/src/test/queries/clientpositive/tez_fsstat.q                 | 1 +
 ql/src/test/queries/clientpositive/tez_join.q                   | 1 +
 ql/src/test/queries/clientpositive/tez_join_hash.q              | 1 +
 ql/src/test/queries/clientpositive/tez_join_result_complex.q    | 2 +-
 ql/src/test/queries/clientpositive/tez_join_tests.q             | 1 +
 ql/src/test/queries/clientpositive/tez_joins_explain.q          | 1 +
 ql/src/test/queries/clientpositive/tez_schema_evolution.q       | 1 +
 ql/src/test/queries/clientpositive/tez_self_join.q              | 1 +
 ql/src/test/queries/clientpositive/tez_smb_1.q                  | 1 +
 ql/src/test/queries/clientpositive/tez_smb_empty.q              | 1 +
 ql/src/test/queries/clientpositive/tez_smb_main.q               | 1 +
 ql/src/test/queries/clientpositive/tez_union.q                  | 1 +
 .../test/queries/clientpositive/tez_union_dynamic_partition.q   | 1 +
 .../test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q | 1 +
 .../test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q | 1 +
 ql/src/test/queries/clientpositive/timestamp_lazy.q             | 1 +
 ql/src/test/queries/clientpositive/topn.q                       | 1 +
 ql/src/test/queries/clientpositive/transform_ppr1.q             | 1 +
 ql/src/test/queries/clientpositive/truncate_column.q            | 1 +
 ql/src/test/queries/clientpositive/truncate_column_buckets.q    | 1 +
 .../test/queries/clientpositive/truncate_column_list_bucket.q   | 1 +
 ql/src/test/queries/clientpositive/truncate_column_merge.q      | 1 +
 ql/src/test/queries/clientpositive/type_widening.q              | 1 +
 ql/src/test/queries/clientpositive/udaf_corr.q                  | 1 +
 ql/src/test/queries/clientpositive/udaf_covar_pop.q             | 1 +
 ql/src/test/queries/clientpositive/udaf_covar_samp.q            | 1 +
 ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q  | 1 +
 ql/src/test/queries/clientpositive/udf1.q                       | 1 +
 ql/src/test/queries/clientpositive/udf3.q                       | 1 +
 ql/src/test/queries/clientpositive/udf9.q                       | 1 +
 ql/src/test/queries/clientpositive/udf_10_trims.q               | 1 +
 ql/src/test/queries/clientpositive/udf_between.q                | 1 +
 ql/src/test/queries/clientpositive/udf_case_column_pruning.q    | 1 +
 ql/src/test/queries/clientpositive/udf_folder_constants.q       | 1 +
 ql/src/test/queries/clientpositive/udf_hour.q                   | 1 +
 ql/src/test/queries/clientpositive/udf_like.q                   | 1 +
 ql/src/test/queries/clientpositive/udf_lower.q                  | 1 +
 ql/src/test/queries/clientpositive/udf_minute.q                 | 1 +
 ql/src/test/queries/clientpositive/udf_parse_url.q              | 1 +
 ql/src/test/queries/clientpositive/udf_reflect2.q               | 1 +
 ql/src/test/queries/clientpositive/udf_second.q                 | 1 +
 ql/src/test/queries/clientpositive/udf_sentences.q              | 1 +
 ql/src/test/queries/clientpositive/udf_unix_timestamp.q         | 1 +
 ql/src/test/queries/clientpositive/udtf_explode.q               | 1 +
 ql/src/test/queries/clientpositive/udtf_json_tuple.q            | 1 +
 ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q       | 1 +
 ql/src/test/queries/clientpositive/union.q                      | 1 +
 ql/src/test/queries/clientpositive/union10.q                    | 1 +
 ql/src/test/queries/clientpositive/union11.q                    | 1 +
 ql/src/test/queries/clientpositive/union12.q                    | 1 +
 ql/src/test/queries/clientpositive/union13.q                    | 1 +
 ql/src/test/queries/clientpositive/union14.q                    | 1 +
 ql/src/test/queries/clientpositive/union15.q                    | 1 +
 ql/src/test/queries/clientpositive/union16.q                    | 1 +
 ql/src/test/queries/clientpositive/union2.q                     | 1 +
 ql/src/test/queries/clientpositive/union20.q                    | 1 +
 ql/src/test/queries/clientpositive/union22.q                    | 1 +
 ql/src/test/queries/clientpositive/union23.q                    | 1 +
 ql/src/test/queries/clientpositive/union24.q                    | 1 +
 ql/src/test/queries/clientpositive/union25.q                    | 1 +
 ql/src/test/queries/clientpositive/union27.q                    | 1 +
 ql/src/test/queries/clientpositive/union28.q                    | 1 +
 ql/src/test/queries/clientpositive/union30.q                    | 1 +
 ql/src/test/queries/clientpositive/union32.q                    | 1 +
 ql/src/test/queries/clientpositive/union33.q                    | 1 +
 ql/src/test/queries/clientpositive/union34.q                    | 1 +
 ql/src/test/queries/clientpositive/union36.q                    | 1 +
 ql/src/test/queries/clientpositive/union4.q                     | 1 +
 ql/src/test/queries/clientpositive/union5.q                     | 1 +
 ql/src/test/queries/clientpositive/union6.q                     | 1 +
 ql/src/test/queries/clientpositive/union7.q                     | 1 +
 ql/src/test/queries/clientpositive/union8.q                     | 1 +
 ql/src/test/queries/clientpositive/union9.q                     | 1 +
 ql/src/test/queries/clientpositive/unionDistinct_1.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_1.q             | 1 +
 ql/src/test/queries/clientpositive/union_remove_10.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_11.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_12.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_13.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_14.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_15.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_16.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_17.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_18.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_19.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_2.q             | 1 +
 ql/src/test/queries/clientpositive/union_remove_20.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_21.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_22.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_23.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_24.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_25.q            | 1 +
 ql/src/test/queries/clientpositive/union_remove_3.q             | 1 +
 ql/src/test/queries/clientpositive/union_remove_4.q             | 1 +
 ql/src/test/queries/clientpositive/union_remove_5.q             | 1 +
 ql/src/test/queries/clientpositive/union_remove_6.q             | 1 +
 ql/src/test/queries/clientpositive/union_remove_6_subq.q        | 1 +
 ql/src/test/queries/clientpositive/union_remove_7.q             | 1 +
 ql/src/test/queries/clientpositive/union_remove_8.q             | 1 +
 ql/src/test/queries/clientpositive/union_remove_9.q             | 1 +
 ql/src/test/queries/clientpositive/union_script.q               | 1 +
 ql/src/test/queries/clientpositive/union_top_level.q            | 1 +
 ql/src/test/queries/clientpositive/union_type_chk.q             | 2 ++
 ql/src/test/queries/clientpositive/union_view.q                 | 1 +
 ql/src/test/queries/clientpositive/unionall_unbalancedppd.q     | 1 +
 ql/src/test/queries/clientpositive/updateAccessTime.q           | 1 +
 .../test/queries/clientpositive/update_after_multiple_inserts.q | 1 +
 ql/src/test/queries/clientpositive/update_all_non_partitioned.q | 1 +
 ql/src/test/queries/clientpositive/update_all_partitioned.q     | 1 +
 ql/src/test/queries/clientpositive/update_all_types.q           | 1 +
 ql/src/test/queries/clientpositive/update_tmp_table.q           | 1 +
 ql/src/test/queries/clientpositive/update_two_cols.q            | 1 +
 ql/src/test/queries/clientpositive/update_where_no_match.q      | 1 +
 .../test/queries/clientpositive/update_where_non_partitioned.q  | 1 +
 ql/src/test/queries/clientpositive/update_where_partitioned.q   | 1 +
 ql/src/test/queries/clientpositive/varchar_1.q                  | 1 +
 ql/src/test/queries/clientpositive/varchar_join1.q              | 1 +
 .../test/queries/clientpositive/vector_aggregate_without_gby.q  | 1 +
 ql/src/test/queries/clientpositive/vector_auto_smb_mapjoin_14.q | 1 +
 ql/src/test/queries/clientpositive/vector_between_in.q          | 1 +
 ql/src/test/queries/clientpositive/vector_binary_join_groupby.q | 1 +
 ql/src/test/queries/clientpositive/vector_bround.q              | 1 +
 ql/src/test/queries/clientpositive/vector_bucket.q              | 1 +
 ql/src/test/queries/clientpositive/vector_cast_constant.q       | 1 +
 ql/src/test/queries/clientpositive/vector_char_2.q              | 1 +
 ql/src/test/queries/clientpositive/vector_char_mapjoin1.q       | 1 +
 ql/src/test/queries/clientpositive/vector_coalesce_2.q          | 1 +
 ql/src/test/queries/clientpositive/vector_count_distinct.q      | 1 +
 ql/src/test/queries/clientpositive/vector_data_types.q          | 1 +
 ql/src/test/queries/clientpositive/vector_date_1.q              | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_1.q           | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_10_0.q        | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_2.q           | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_3.q           | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_4.q           | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_5.q           | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_6.q           | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_expressions.q | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q     | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q  | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_precision.q   | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_round.q       | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_round_2.q     | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_trailing.q    | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_udf.q         | 1 +
 ql/src/test/queries/clientpositive/vector_decimal_udf2.q        | 1 +
 ql/src/test/queries/clientpositive/vector_distinct_2.q          | 1 +
 ql/src/test/queries/clientpositive/vector_elt.q                 | 1 +
 ql/src/test/queries/clientpositive/vector_groupby_3.q           | 1 +
 ql/src/test/queries/clientpositive/vector_groupby_reduce.q      | 1 +
 ql/src/test/queries/clientpositive/vector_if_expr.q             | 1 +
 ql/src/test/queries/clientpositive/vector_inner_join.q          | 1 +
 ql/src/test/queries/clientpositive/vector_interval_1.q          | 1 +
 ql/src/test/queries/clientpositive/vector_interval_2.q          | 1 +
 ql/src/test/queries/clientpositive/vector_interval_mapjoin.q    | 1 +
 ql/src/test/queries/clientpositive/vector_join_filters.q        | 1 +
 ql/src/test/queries/clientpositive/vector_join_nulls.q          | 1 +
 ql/src/test/queries/clientpositive/vector_left_outer_join.q     | 1 +
 ql/src/test/queries/clientpositive/vector_left_outer_join2.q    | 1 +
 ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q      | 1 +
 .../test/queries/clientpositive/vector_mr_diff_schema_alias.q   | 1 +
 .../test/queries/clientpositive/vector_non_string_partition.q   | 1 +
 ql/src/test/queries/clientpositive/vector_orderby_5.q           | 1 +
 ql/src/test/queries/clientpositive/vector_outer_join0.q         | 1 +
 ql/src/test/queries/clientpositive/vector_outer_join5.q         | 1 +
 ql/src/test/queries/clientpositive/vector_outer_join6.q         | 1 +
 .../queries/clientpositive/vector_partition_diff_num_cols.q     | 1 +
 .../test/queries/clientpositive/vector_partitioned_date_time.q  | 1 +
 ql/src/test/queries/clientpositive/vector_reduce1.q             | 1 +
 ql/src/test/queries/clientpositive/vector_reduce2.q             | 1 +
 ql/src/test/queries/clientpositive/vector_reduce3.q             | 1 +
 ql/src/test/queries/clientpositive/vector_string_concat.q       | 1 +
 ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q    | 1 +
 ql/src/test/queries/clientpositive/vectorization_0.q            | 1 +
 ql/src/test/queries/clientpositive/vectorization_12.q           | 1 +
 ql/src/test/queries/clientpositive/vectorization_13.q           | 1 +
 ql/src/test/queries/clientpositive/vectorization_14.q           | 1 +
 ql/src/test/queries/clientpositive/vectorization_15.q           | 1 +
 ql/src/test/queries/clientpositive/vectorization_16.q           | 1 +
 ql/src/test/queries/clientpositive/vectorization_17.q           | 1 +
 ql/src/test/queries/clientpositive/vectorization_3.q            | 1 +
 ql/src/test/queries/clientpositive/vectorization_7.q            | 1 +
 ql/src/test/queries/clientpositive/vectorization_8.q            | 1 +
 ql/src/test/queries/clientpositive/vectorization_9.q            | 1 +
 ql/src/test/queries/clientpositive/vectorization_div0.q         | 1 +
 ql/src/test/queries/clientpositive/vectorization_limit.q        | 1 +
 ql/src/test/queries/clientpositive/vectorization_not.q          | 1 +
 ql/src/test/queries/clientpositive/vectorization_part.q         | 1 +
 ql/src/test/queries/clientpositive/vectorization_part_project.q | 1 +
 ql/src/test/queries/clientpositive/vectorization_part_varchar.q | 1 +
 ql/src/test/queries/clientpositive/vectorization_pushdown.q     | 1 +
 .../test/queries/clientpositive/vectorization_short_regress.q   | 1 +
 ql/src/test/queries/clientpositive/vectorized_casts.q           | 1 +
 ql/src/test/queries/clientpositive/vectorized_context.q         | 1 +
 ql/src/test/queries/clientpositive/vectorized_date_funcs.q      | 1 +
 ql/src/test/queries/clientpositive/vectorized_distinct_gby.q    | 1 +
 .../clientpositive/vectorized_dynamic_partition_pruning.q       | 1 +
 ql/src/test/queries/clientpositive/vectorized_mapjoin.q         | 1 +
 ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q  | 1 +
 ql/src/test/queries/clientpositive/vectorized_parquet_types.q   | 1 +
 ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q | 1 +
 ql/src/test/queries/clientpositive/vectorized_shufflejoin.q     | 1 +
 ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q | 1 +
 .../queries/clientpositive/vectorized_timestamp_ints_casts.q    | 1 +
 ql/src/test/queries/clientpositive/virtual_column.q             | 1 +
 ql/src/test/queries/clientpositive/windowing.q                  | 1 +
 .../clientnegative/ptf_negative_InvalidValueBoundary.q.out      | 2 +-
 .../src/test/org/apache/hive/service/cli/CLIServiceTest.java    | 5 +++--
 988 files changed, 1007 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index c36d566..4d881ba 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -781,7 +781,7 @@ public class HiveConf extends Configuration {
         "hive.txn.valid.txns,hive.script.operator.env.blacklist",
         "Comma separated list of keys from the configuration file not to convert to environment " +
         "variables when envoking the script operator"),
-    HIVEMAPREDMODE("hive.mapred.mode", "nonstrict",
+    HIVEMAPREDMODE("hive.mapred.mode", "strict",
         "The mode in which the Hive operations are being performed. \n" +
         "In strict mode, some risky queries are not allowed to run. They include:\n" +
         "  Cartesian Product.\n" +

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientnegative/invalid_row_sequence.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientnegative/invalid_row_sequence.q b/contrib/src/test/queries/clientnegative/invalid_row_sequence.q
index f7d7e15..1de9d9e 100644
--- a/contrib/src/test/queries/clientnegative/invalid_row_sequence.q
+++ b/contrib/src/test/queries/clientnegative/invalid_row_sequence.q
@@ -6,7 +6,7 @@ add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:h
 
 create temporary function row_sequence as 
 'org.apache.hadoop.hive.contrib.udf.UDFRowSequence';
-
+set hive.mapred.mode=nonstrict;
 select key
 from (select key from src order by key) x
 where row_sequence() < 5

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/dboutput.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/dboutput.q b/contrib/src/test/queries/clientpositive/dboutput.q
index 4c4f5d5..2b20738 100644
--- a/contrib/src/test/queries/clientpositive/dboutput.q
+++ b/contrib/src/test/queries/clientpositive/dboutput.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 CREATE TEMPORARY FUNCTION dboutput AS 'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput';

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/serde_regex.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/serde_regex.q b/contrib/src/test/queries/clientpositive/serde_regex.q
index 466f9a6..d75d607 100644
--- a/contrib/src/test/queries/clientpositive/serde_regex.q
+++ b/contrib/src/test/queries/clientpositive/serde_regex.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/serde_typedbytes4.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/serde_typedbytes4.q b/contrib/src/test/queries/clientpositive/serde_typedbytes4.q
index 21d61ee..bb1f257 100644
--- a/contrib/src/test/queries/clientpositive/serde_typedbytes4.q
+++ b/contrib/src/test/queries/clientpositive/serde_typedbytes4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 drop table dest1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/udaf_example_avg.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/udaf_example_avg.q b/contrib/src/test/queries/clientpositive/udaf_example_avg.q
index d8e63f2..0f69926 100644
--- a/contrib/src/test/queries/clientpositive/udaf_example_avg.q
+++ b/contrib/src/test/queries/clientpositive/udaf_example_avg.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 CREATE TEMPORARY FUNCTION example_avg AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleAvg';

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q b/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q
index 869eac1..817cf32 100644
--- a/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q
+++ b/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 CREATE TEMPORARY FUNCTION example_group_concat AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleGroupConcat';

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/udaf_example_max.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/udaf_example_max.q b/contrib/src/test/queries/clientpositive/udaf_example_max.q
index ff2d66b..7db78a7 100644
--- a/contrib/src/test/queries/clientpositive/udaf_example_max.q
+++ b/contrib/src/test/queries/clientpositive/udaf_example_max.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 CREATE TEMPORARY FUNCTION example_max AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMax';

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/udaf_example_max_n.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/udaf_example_max_n.q b/contrib/src/test/queries/clientpositive/udaf_example_max_n.q
index 4349647..4cc2878 100644
--- a/contrib/src/test/queries/clientpositive/udaf_example_max_n.q
+++ b/contrib/src/test/queries/clientpositive/udaf_example_max_n.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 CREATE TEMPORARY FUNCTION example_max_n AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMaxN';

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/udaf_example_min.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/udaf_example_min.q b/contrib/src/test/queries/clientpositive/udaf_example_min.q
index 765f205..bd94252 100644
--- a/contrib/src/test/queries/clientpositive/udaf_example_min.q
+++ b/contrib/src/test/queries/clientpositive/udaf_example_min.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 CREATE TEMPORARY FUNCTION example_min AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMin';

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/udaf_example_min_n.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/udaf_example_min_n.q b/contrib/src/test/queries/clientpositive/udaf_example_min_n.q
index 436e3c1..12bf1ec 100644
--- a/contrib/src/test/queries/clientpositive/udaf_example_min_n.q
+++ b/contrib/src/test/queries/clientpositive/udaf_example_min_n.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 CREATE TEMPORARY FUNCTION example_min_n AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMinN';
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/contrib/src/test/queries/clientpositive/udf_row_sequence.q
----------------------------------------------------------------------
diff --git a/contrib/src/test/queries/clientpositive/udf_row_sequence.q b/contrib/src/test/queries/clientpositive/udf_row_sequence.q
index 061f340..44099b1 100644
--- a/contrib/src/test/queries/clientpositive/udf_row_sequence.q
+++ b/contrib/src/test/queries/clientpositive/udf_row_sequence.q
@@ -12,7 +12,7 @@ create temporary function row_sequence as
 DESCRIBE FUNCTION EXTENDED row_sequence;
 
 set mapred.reduce.tasks=1;
-
+set hive.mapred.mode=nonstrict;
 explain
 select key, row_sequence() as r
 from (select key from src order by key) x

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
----------------------------------------------------------------------
diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
index b87313a..1dbd024 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
@@ -83,7 +83,7 @@ public class HCatBaseTest {
     hiveConf.setVar(HiveConf.ConfVars.POSTEXECHOOKS, "");
     hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
     hiveConf.setVar(HiveConf.ConfVars.METASTOREWAREHOUSE, TEST_WAREHOUSE_DIR);
-
+    hiveConf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     if (Shell.WINDOWS) {
       WindowsPathUtil.convertPathsFromWindowsToHdfs(hiveConf);
     }
@@ -99,7 +99,7 @@ public class HCatBaseTest {
   }
 
   /**
-   * creates PigServer in LOCAL mode.  
+   * creates PigServer in LOCAL mode.
    * http://pig.apache.org/docs/r0.12.0/perf.html#error-handling
    * @param stopOnFailure equivalent of "-stop_on_failure" command line arg, setting to 'true' makes
    *                      debugging easier

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java
----------------------------------------------------------------------
diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java
index 58764a5..7964676 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java
@@ -19,7 +19,6 @@
 
 package org.apache.hive.hcatalog.mapreduce;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TestHCatExternalDynamicPartitioned extends TestHCatDynamicPartitioned {

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoader.java
----------------------------------------------------------------------
diff --git a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoader.java b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoader.java
index 28e711a..2440cb5 100644
--- a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoader.java
+++ b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoader.java
@@ -105,7 +105,7 @@ public class TestHCatLoader {
         }});
       }};
 
-  private String storageFormat;
+  private final String storageFormat;
 
   @Parameterized.Parameters
   public static Collection<Object[]> generateParameters() {
@@ -176,6 +176,7 @@ public class TestHCatLoader {
     hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
     hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
     hiveConf.set(HiveConf.ConfVars.METASTOREWAREHOUSE.varname, TEST_WAREHOUSE_DIR);
+    hiveConf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
 
     if (Shell.WINDOWS) {
       WindowsPathUtil.convertPathsFromWindowsToHdfs(hiveConf);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatStorerMulti.java
----------------------------------------------------------------------
diff --git a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatStorerMulti.java b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatStorerMulti.java
index a4e44d6..1452be6 100644
--- a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatStorerMulti.java
+++ b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatStorerMulti.java
@@ -18,8 +18,6 @@
  */
 package org.apache.hive.hcatalog.pig;
 
-import com.google.common.collect.ImmutableSet;
-
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -77,7 +75,7 @@ public class TestHCatStorerMulti {
         }});
       }};
 
-  private String storageFormat;
+  private final String storageFormat;
 
   @Parameterized.Parameters
   public static Collection<Object[]> generateParameters() {
@@ -119,6 +117,7 @@ public class TestHCatStorerMulti {
       hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
       hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
       hiveConf.set(HiveConf.ConfVars.METASTOREWAREHOUSE.varname, TEST_WAREHOUSE_DIR);
+      hiveConf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
       driver = new Driver(hiveConf);
       SessionState.start(new CliSessionState(hiveConf));
     }

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java b/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java
index d846a63..b798379 100644
--- a/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java
+++ b/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.fs.permission.AclEntryType;
 import org.apache.hadoop.fs.permission.FsAction;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 
@@ -44,6 +45,7 @@ public class TestExtendedAcls extends FolderPermissionBase {
     conf = new HiveConf(TestExtendedAcls.class);
     //setup the mini DFS with acl's enabled.
     conf.set("dfs.namenode.acls.enabled", "true");
+    conf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     baseSetup();
   }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
index 85fff23..d4cd818 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
@@ -94,6 +94,7 @@ public class HBaseIntegrationTests {
         SessionStateConfigUserAuthenticator.class.getName());
     conf.setBoolVar(HiveConf.ConfVars.HIVE_AUTHORIZATION_ENABLED, true);
     conf.setVar(HiveConf.ConfVars.USERS_IN_ADMIN_ROLE, System.getProperty("user.name"));
+    conf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE,"nonstrict");
     //HBaseReadWrite.setTestConnection(hconn);
 
     SessionState.start(new CliSessionState(conf));

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java
index 95691f6..c5337ff 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java
@@ -43,6 +43,7 @@ public class TestMTQueries extends BaseTestQueries {
       util.getConf().setBoolean("hive.exec.submitviachild", true);
       util.getConf().setBoolean("hive.exec.submit.local.task.via.child", true);
       util.getConf().set("hive.stats.dbclass", "fs");
+      util.getConf().set("hive.mapred.mode", "nonstrict");
     }
     boolean success = QTestUtil.queryListRunnerMultiThreaded(qfiles, qts);
     if (!success) {


[5/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/exim_18_part_external.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_18_part_external.q b/ql/src/test/queries/clientpositive/exim_18_part_external.q
index a300b1d..4e6974c 100644
--- a/ql/src/test/queries/clientpositive/exim_18_part_external.q
+++ b/ql/src/test/queries/clientpositive/exim_18_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/d13b5db2/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q b/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
index a821c75..e7bfdcf 100644
--- a/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
+++ b/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.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/d13b5db2/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_19_part_external_location.q b/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
index be12164..389b983 100644
--- a/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
+++ b/ql/src/test/queries/clientpositive/exim_19_part_external_location.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/d13b5db2/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q b/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q
index 000904a..5b29ebb 100644
--- a/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q
+++ b/ql/src/test/queries/clientpositive/exim_20_part_managed_location.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/d13b5db2/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q b/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q
index cb6af0e..9012b0e 100644
--- a/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q
+++ b/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.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/d13b5db2/ql/src/test/queries/clientpositive/exim_hidden_files.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_hidden_files.q b/ql/src/test/queries/clientpositive/exim_hidden_files.q
index f58c9f9..18bf3ad 100644
--- a/ql/src/test/queries/clientpositive/exim_hidden_files.q
+++ b/ql/src/test/queries/clientpositive/exim_hidden_files.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/d13b5db2/ql/src/test/queries/clientpositive/explain_dependency.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explain_dependency.q b/ql/src/test/queries/clientpositive/explain_dependency.q
index eecf2a6..814ac36 100644
--- a/ql/src/test/queries/clientpositive/explain_dependency.q
+++ b/ql/src/test/queries/clientpositive/explain_dependency.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- This test is used for testing EXPLAIN DEPENDENCY command
 
 -- Create some views

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/explain_logical.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explain_logical.q b/ql/src/test/queries/clientpositive/explain_logical.q
index 4b0fa5b..a468264 100644
--- a/ql/src/test/queries/clientpositive/explain_logical.q
+++ b/ql/src/test/queries/clientpositive/explain_logical.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- This test is used for testing EXPLAIN LOGICAL command
 
 -- Create some views

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/explain_rearrange.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explain_rearrange.q b/ql/src/test/queries/clientpositive/explain_rearrange.q
index ca2da35..0314132 100644
--- a/ql/src/test/queries/clientpositive/explain_rearrange.q
+++ b/ql/src/test/queries/clientpositive/explain_rearrange.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- query from auto_sortmerge_join_9.q
 
 CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/explainuser_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_1.q b/ql/src/test/queries/clientpositive/explainuser_1.q
index 785bb07..5baef62 100644
--- a/ql/src/test/queries/clientpositive/explainuser_1.q
+++ b/ql/src/test/queries/clientpositive/explainuser_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=true;
 
 explain create table src_orc_merge_test_part(key int, value string) partitioned by (ds string, ts string) stored as orc;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/explainuser_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_3.q b/ql/src/test/queries/clientpositive/explainuser_3.q
index dd86b76..4f1fdab 100644
--- a/ql/src/test/queries/clientpositive/explainuser_3.q
+++ b/ql/src/test/queries/clientpositive/explainuser_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=true;
 
 set hive.support.concurrency=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/external_table_with_space_in_location_path.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/external_table_with_space_in_location_path.q b/ql/src/test/queries/clientpositive/external_table_with_space_in_location_path.q
index ad07046..78a6e8a 100644
--- a/ql/src/test/queries/clientpositive/external_table_with_space_in_location_path.q
+++ b/ql/src/test/queries/clientpositive/external_table_with_space_in_location_path.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/test/;
 
 dfs -copyFromLocal ../../data/files/ext_test_space hdfs:///tmp/test/ext_test_space;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/extrapolate_part_stats_full.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/extrapolate_part_stats_full.q b/ql/src/test/queries/clientpositive/extrapolate_part_stats_full.q
index c4f76b5..034b93e 100644
--- a/ql/src/test/queries/clientpositive/extrapolate_part_stats_full.q
+++ b/ql/src/test/queries/clientpositive/extrapolate_part_stats_full.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.fetch.column.stats=true;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q b/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q
index 72350e8..5a412a3 100644
--- a/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q
+++ b/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.fetch.column.stats=true;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q b/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q
index 6e242a8..a80c86c 100644
--- a/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q
+++ b/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.metastore.stats.ndv.densityfunction=true;
 set hive.stats.fetch.column.stats=true;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/file_with_header_footer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/file_with_header_footer.q b/ql/src/test/queries/clientpositive/file_with_header_footer.q
index 8b65c78..8913e54 100644
--- a/ql/src/test/queries/clientpositive/file_with_header_footer.q
+++ b/ql/src/test/queries/clientpositive/file_with_header_footer.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/test/;
 
 dfs -copyFromLocal ../../data/files/header_footer_table_1 hdfs:///tmp/test/header_footer_table_1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/fileformat_mix.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fileformat_mix.q b/ql/src/test/queries/clientpositive/fileformat_mix.q
index 1e0c164..f5bcaec 100644
--- a/ql/src/test/queries/clientpositive/fileformat_mix.q
+++ b/ql/src/test/queries/clientpositive/fileformat_mix.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 create table fileformat_mix_test (src int, value string) partitioned by (ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/filter_cond_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/filter_cond_pushdown.q b/ql/src/test/queries/clientpositive/filter_cond_pushdown.q
index 2425706..c325ef8 100644
--- a/ql/src/test/queries/clientpositive/filter_cond_pushdown.q
+++ b/ql/src/test/queries/clientpositive/filter_cond_pushdown.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT f.key, g.value
 FROM src f JOIN src m JOIN src g ON(g.value = m.value AND m.value is not null AND m.value !='')

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/filter_join_breaktask.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/filter_join_breaktask.q b/ql/src/test/queries/clientpositive/filter_join_breaktask.q
index fe4c8fe..52cce36 100644
--- a/ql/src/test/queries/clientpositive/filter_join_breaktask.q
+++ b/ql/src/test/queries/clientpositive/filter_join_breaktask.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/filter_join_breaktask2.q b/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
index a7b3221..e88ad41 100644
--- a/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
+++ b/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q b/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q
index b6b54b4..9f342c1 100644
--- a/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q
+++ b/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain
 SELECT  
 SUM((CASE WHEN 1000000 = 0 THEN NULL ELSE l_partkey / 1000000 END)),

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/fouter_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fouter_join_ppr.q b/ql/src/test/queries/clientpositive/fouter_join_ppr.q
index 4bf3705..e21a3aa 100644
--- a/ql/src/test/queries/clientpositive/fouter_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/fouter_join_ppr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/gby_star.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/gby_star.q b/ql/src/test/queries/clientpositive/gby_star.q
index 2f7952c..9855460 100644
--- a/ql/src/test/queries/clientpositive/gby_star.q
+++ b/ql/src/test/queries/clientpositive/gby_star.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain
 select *, sum(key) from src group by key, value limit 10;
 select *, sum(key) from src group by key, value limit 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/global_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/global_limit.q b/ql/src/test/queries/clientpositive/global_limit.q
index 988105c..8c5f2ea 100644
--- a/ql/src/test/queries/clientpositive/global_limit.q
+++ b/ql/src/test/queries/clientpositive/global_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.limit.optimize.enable=true;
 set hive.limit.optimize.limit.file=2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1.q b/ql/src/test/queries/clientpositive/groupby1.q
index df69cbd..a8c9a8d 100755
--- a/ql/src/test/queries/clientpositive/groupby1.q
+++ b/ql/src/test/queries/clientpositive/groupby1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby11.q b/ql/src/test/queries/clientpositive/groupby11.q
index e7bdb53..3494136 100644
--- a/ql/src/test/queries/clientpositive/groupby11.q
+++ b/ql/src/test/queries/clientpositive/groupby11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby1_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_limit.q b/ql/src/test/queries/clientpositive/groupby1_limit.q
index 48dadd9..b8e389e 100644
--- a/ql/src/test/queries/clientpositive/groupby1_limit.q
+++ b/ql/src/test/queries/clientpositive/groupby1_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapred.reduce.tasks=31;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby1_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map.q b/ql/src/test/queries/clientpositive/groupby1_map.q
index 46432fb..20eea6e 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map_nomap.q b/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
index b22a61e..059d39c 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set hive.groupby.mapaggr.checkinterval=20;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby1_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map_skew.q b/ql/src/test/queries/clientpositive/groupby1_map_skew.q
index 2ffa995..ab42ee2 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map_skew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby1_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_noskew.q b/ql/src/test/queries/clientpositive/groupby1_noskew.q
index 848bee5..c31528d 100644
--- a/ql/src/test/queries/clientpositive/groupby1_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby1_noskew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2.q b/ql/src/test/queries/clientpositive/groupby2.q
index 1966ee7..9fa4376 100755
--- a/ql/src/test/queries/clientpositive/groupby2.q
+++ b/ql/src/test/queries/clientpositive/groupby2.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;
 set hive.map.aggr=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby2_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_limit.q b/ql/src/test/queries/clientpositive/groupby2_limit.q
index 3049924..2608725 100644
--- a/ql/src/test/queries/clientpositive/groupby2_limit.q
+++ b/ql/src/test/queries/clientpositive/groupby2_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapred.reduce.tasks=31;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby2_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map.q b/ql/src/test/queries/clientpositive/groupby2_map.q
index 1068800..e3f9e31 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
index ebbb1da..d36301a 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby2_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map_skew.q b/ql/src/test/queries/clientpositive/groupby2_map_skew.q
index 8640241..73a7594 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map_skew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby2_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_noskew.q b/ql/src/test/queries/clientpositive/groupby2_noskew.q
index 2651232..182666a 100644
--- a/ql/src/test/queries/clientpositive/groupby2_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby2_noskew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q
index 7ae15ba..325abd6 100644
--- a/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3.q b/ql/src/test/queries/clientpositive/groupby3.q
index a9b4039..d709d9b 100755
--- a/ql/src/test/queries/clientpositive/groupby3.q
+++ b/ql/src/test/queries/clientpositive/groupby3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby3_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map.q b/ql/src/test/queries/clientpositive/groupby3_map.q
index 4d2bf66..7aea2d4 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
index 50243be..60d7b7f 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby3_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map_skew.q b/ql/src/test/queries/clientpositive/groupby3_map_skew.q
index e700a82..f9cb46e 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map_skew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby3_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_noskew.q b/ql/src/test/queries/clientpositive/groupby3_noskew.q
index d33f12c..2dbb04a 100644
--- a/ql/src/test/queries/clientpositive/groupby3_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby3_noskew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
index 86d8986..55d9a58 100644
--- a/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4.q b/ql/src/test/queries/clientpositive/groupby4.q
index dc37fa8..d5f5426 100755
--- a/ql/src/test/queries/clientpositive/groupby4.q
+++ b/ql/src/test/queries/clientpositive/groupby4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby4_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_map.q b/ql/src/test/queries/clientpositive/groupby4_map.q
index 8ecce23..f7fba87 100644
--- a/ql/src/test/queries/clientpositive/groupby4_map.q
+++ b/ql/src/test/queries/clientpositive/groupby4_map.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby4_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_map_skew.q b/ql/src/test/queries/clientpositive/groupby4_map_skew.q
index eb2001c..867e2e2 100644
--- a/ql/src/test/queries/clientpositive/groupby4_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby4_map_skew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby4_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_noskew.q b/ql/src/test/queries/clientpositive/groupby4_noskew.q
index 771f01e..b5fead5 100644
--- a/ql/src/test/queries/clientpositive/groupby4_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby4_noskew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby5.q b/ql/src/test/queries/clientpositive/groupby5.q
index 4ba6b69..a403170 100755
--- a/ql/src/test/queries/clientpositive/groupby5.q
+++ b/ql/src/test/queries/clientpositive/groupby5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby5_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby5_noskew.q b/ql/src/test/queries/clientpositive/groupby5_noskew.q
index ce51f91..eef5f73 100644
--- a/ql/src/test/queries/clientpositive/groupby5_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby5_noskew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6.q b/ql/src/test/queries/clientpositive/groupby6.q
index 17597cb..bd71d7d 100755
--- a/ql/src/test/queries/clientpositive/groupby6.q
+++ b/ql/src/test/queries/clientpositive/groupby6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby6_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_map.q b/ql/src/test/queries/clientpositive/groupby6_map.q
index 61b0a11..4a1542b 100644
--- a/ql/src/test/queries/clientpositive/groupby6_map.q
+++ b/ql/src/test/queries/clientpositive/groupby6_map.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby6_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_map_skew.q b/ql/src/test/queries/clientpositive/groupby6_map_skew.q
index 8780bbb..0ee2bdb 100644
--- a/ql/src/test/queries/clientpositive/groupby6_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby6_map_skew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby6_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_noskew.q b/ql/src/test/queries/clientpositive/groupby6_noskew.q
index 12fd16a..bf53f10 100644
--- a/ql/src/test/queries/clientpositive/groupby6_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby6_noskew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_cube1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_cube1.q b/ql/src/test/queries/clientpositive/groupby_cube1.q
index 02b41b9..bfa13ee 100644
--- a/ql/src/test/queries/clientpositive/groupby_cube1.q
+++ b/ql/src/test/queries/clientpositive/groupby_cube1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q b/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q
index 8219a5e..a012ae2 100644
--- a/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q
+++ b/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- This test covers HIVE-2332
 
 create table t1 (int1 int, int2 int, str1 string, str2 string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_grouping_sets2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_grouping_sets2.q b/ql/src/test/queries/clientpositive/groupby_grouping_sets2.q
index 30f1b42..824942c 100644
--- a/ql/src/test/queries/clientpositive/groupby_grouping_sets2.q
+++ b/ql/src/test/queries/clientpositive/groupby_grouping_sets2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.new.job.grouping.set.cardinality=2;
 
 CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE; 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_grouping_sets4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_grouping_sets4.q b/ql/src/test/queries/clientpositive/groupby_grouping_sets4.q
index 0c15c6a..06e5e1a 100644
--- a/ql/src/test/queries/clientpositive/groupby_grouping_sets4.q
+++ b/ql/src/test/queries/clientpositive/groupby_grouping_sets4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.merge.mapfiles = false;
 set hive.merge.mapredfiles = false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_grouping_sets5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_grouping_sets5.q b/ql/src/test/queries/clientpositive/groupby_grouping_sets5.q
index d94bd81..6a09c88 100644
--- a/ql/src/test/queries/clientpositive/groupby_grouping_sets5.q
+++ b/ql/src/test/queries/clientpositive/groupby_grouping_sets5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.merge.mapfiles = false;
 set hive.merge.mapredfiles = false;
 -- Set merging to false above to make the explain more readable

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q b/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q
index 882608b..5cdb4a5 100644
--- a/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q
+++ b/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE; 
 
 LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_join_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_join_pushdown.q b/ql/src/test/queries/clientpositive/groupby_join_pushdown.q
index bf1ae4b..a6e2568 100644
--- a/ql/src/test/queries/clientpositive/groupby_join_pushdown.q
+++ b/ql/src/test/queries/clientpositive/groupby_join_pushdown.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.transpose.aggr.join=true;
 EXPLAIN
 SELECT f.key, g.key, count(g.key)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_map_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_map_ppr.q b/ql/src/test/queries/clientpositive/groupby_map_ppr.q
index edaf163..cec370f 100644
--- a/ql/src/test/queries/clientpositive/groupby_map_ppr.q
+++ b/ql/src/test/queries/clientpositive/groupby_map_ppr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q
index a72f1e3..21ca124 100644
--- a/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_position.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_position.q b/ql/src/test/queries/clientpositive/groupby_position.q
index 4316d4a..f7e257d 100644
--- a/ql/src/test/queries/clientpositive/groupby_position.q
+++ b/ql/src/test/queries/clientpositive/groupby_position.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.groupby.orderby.position.alias=true;
 
 CREATE TABLE testTable1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_ppd.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_ppd.q b/ql/src/test/queries/clientpositive/groupby_ppd.q
index 4cda623..b304dfb 100644
--- a/ql/src/test/queries/clientpositive/groupby_ppd.q
+++ b/ql/src/test/queries/clientpositive/groupby_ppd.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- see HIVE-2382
 create table invites (id int, foo int, bar int);
 explain select * from (select foo, bar from (select bar, foo from invites c union all select bar, foo from invites d) b) a group by bar, foo having bar=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_ppr.q b/ql/src/test/queries/clientpositive/groupby_ppr.q
index 2d55760..2f75afc 100644
--- a/ql/src/test/queries/clientpositive/groupby_ppr.q
+++ b/ql/src/test/queries/clientpositive/groupby_ppr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q
index 1249853..74bd2fd 100644
--- a/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_resolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_resolution.q b/ql/src/test/queries/clientpositive/groupby_resolution.q
index 663e33b..25a496e 100644
--- a/ql/src/test/queries/clientpositive/groupby_resolution.q
+++ b/ql/src/test/queries/clientpositive/groupby_resolution.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 set hive.map.aggr=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_rollup1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_rollup1.q b/ql/src/test/queries/clientpositive/groupby_rollup1.q
index 53de6cc..23cac80 100644
--- a/ql/src/test/queries/clientpositive/groupby_rollup1.q
+++ b/ql/src/test/queries/clientpositive/groupby_rollup1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_10.q b/ql/src/test/queries/clientpositive/groupby_sort_10.q
index 4c650f9..910a272 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_10.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_10.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_11.q b/ql/src/test/queries/clientpositive/groupby_sort_11.q
index 32a9658..3b6c172 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_11.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_11.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 1;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_1_23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_1_23.q b/ql/src/test/queries/clientpositive/groupby_sort_1_23.q
index d81e190..67fdd23 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_1_23.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_1_23.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_2.q b/ql/src/test/queries/clientpositive/groupby_sort_2.q
index 8e5a82e..c5b9fd5 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_2.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_2.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_3.q b/ql/src/test/queries/clientpositive/groupby_sort_3.q
index 1686170..44da584 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_3.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_3.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_4.q b/ql/src/test/queries/clientpositive/groupby_sort_4.q
index db1a884..59ebb5a 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_4.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_4.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_5.q b/ql/src/test/queries/clientpositive/groupby_sort_5.q
index 98eed1f..2a01902 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_5.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_5.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_6.q b/ql/src/test/queries/clientpositive/groupby_sort_6.q
index 2ed58d8..2682dbe 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_6.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_6.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_7.q b/ql/src/test/queries/clientpositive/groupby_sort_7.q
index e8cc047..4712492 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_7.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_7.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_8.q b/ql/src/test/queries/clientpositive/groupby_sort_8.q
index 98f363d..13c896b 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_8.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_8.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_9.q b/ql/src/test/queries/clientpositive/groupby_sort_9.q
index eadcbb8..01d7784 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_9.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_9.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 
@@ -18,4 +17,4 @@ EXPLAIN
 select key, count(1) from T1 group by key;
 select key, count(1) from T1 group by key;
 
-DROP TABLE T1;
\ No newline at end of file
+DROP TABLE T1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_skew_1_23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_skew_1_23.q b/ql/src/test/queries/clientpositive/groupby_sort_skew_1_23.q
index 0a94b3a..39b9420 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_skew_1_23.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_skew_1_23.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 set hive.groupby.skewindata=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/groupby_sort_test_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_test_1.q b/ql/src/test/queries/clientpositive/groupby_sort_test_1.q
index faf5c99..9b3105e 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_test_1.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_test_1.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/having.q b/ql/src/test/queries/clientpositive/having.q
index fdba5cd..52bf4ab 100644
--- a/ql/src/test/queries/clientpositive/having.q
+++ b/ql/src/test/queries/clientpositive/having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 EXPLAIN SELECT count(value) AS c FROM src GROUP BY key HAVING c > 3;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/having2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/having2.q b/ql/src/test/queries/clientpositive/having2.q
index 83ae1e1..7b35365 100644
--- a/ql/src/test/queries/clientpositive/having2.q
+++ b/ql/src/test/queries/clientpositive/having2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 CREATE TABLE TestV1_Staples (
       Item_Count INT,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
index f98dfa9..dd42bb3 100644
--- a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- Hybrid Grace Hash Join
 -- Test basic functionalities:

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q
index d6a5250..b9923f6 100644
--- a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q
+++ b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- Hybrid Grace Hash Join
 -- Test n-way join

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q b/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q
index 6253a30..808ad66 100644
--- a/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q
+++ b/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table implicit_cast_during_insert (c1 int, c2 string)
   partitioned by (p1 string) stored as orc;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto.q b/ql/src/test/queries/clientpositive/index_auto.q
index e62d114..fe8839a 100644
--- a/ql/src/test/queries/clientpositive/index_auto.q
+++ b/ql/src/test/queries/clientpositive/index_auto.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- try the query without indexing, with manual indexing, and with automatic indexing
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_empty.q b/ql/src/test/queries/clientpositive/index_auto_empty.q
index 12c6681..7567887 100644
--- a/ql/src/test/queries/clientpositive/index_auto_empty.q
+++ b/ql/src/test/queries/clientpositive/index_auto_empty.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Test to ensure that an empty index result is propagated correctly
 
 CREATE DATABASE it;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_file_format.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_file_format.q b/ql/src/test/queries/clientpositive/index_auto_file_format.q
index f62fd63..2afafb8 100644
--- a/ql/src/test/queries/clientpositive/index_auto_file_format.q
+++ b/ql/src/test/queries/clientpositive/index_auto_file_format.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_mult_tables.q b/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
index 65098ea..8bc3fdd 100644
--- a/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
+++ b/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- try the query without indexing, with manual indexing, and with automatic indexing
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q b/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
index e673721..44ee92c 100644
--- a/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
+++ b/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- try the query without indexing, with manual indexing, and with automatic indexing
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_multiple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_multiple.q b/ql/src/test/queries/clientpositive/index_auto_multiple.q
index 36ab425..2bcb5a5 100644
--- a/ql/src/test/queries/clientpositive/index_auto_multiple.q
+++ b/ql/src/test/queries/clientpositive/index_auto_multiple.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_partitioned.q b/ql/src/test/queries/clientpositive/index_auto_partitioned.q
index f9f9a1b..e25fdb9 100644
--- a/ql/src/test/queries/clientpositive/index_auto_partitioned.q
+++ b/ql/src/test/queries/clientpositive/index_auto_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 set hive.fetch.task.conversion=none;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_self_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_self_join.q b/ql/src/test/queries/clientpositive/index_auto_self_join.q
index 72c6f61..2ce6d1e 100644
--- a/ql/src/test/queries/clientpositive/index_auto_self_join.q
+++ b/ql/src/test/queries/clientpositive/index_auto_self_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- try the query without indexing, with manual indexing, and with automatic indexing
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_unused.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_unused.q b/ql/src/test/queries/clientpositive/index_auto_unused.q
index a52b07b..4e33366 100644
--- a/ql/src/test/queries/clientpositive/index_auto_unused.q
+++ b/ql/src/test/queries/clientpositive/index_auto_unused.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_auto_update.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_update.q b/ql/src/test/queries/clientpositive/index_auto_update.q
index 976de5c..a5454e2 100644
--- a/ql/src/test/queries/clientpositive/index_auto_update.q
+++ b/ql/src/test/queries/clientpositive/index_auto_update.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Test if index is actually being used.
 
 -- Create temp, and populate it with some values in src.

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_bitmap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap.q b/ql/src/test/queries/clientpositive/index_bitmap.q
index 134d022..91a4e54 100644
--- a/ql/src/test/queries/clientpositive/index_bitmap.q
+++ b/ql/src/test/queries/clientpositive/index_bitmap.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_bitmap3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap3.q b/ql/src/test/queries/clientpositive/index_bitmap3.q
index 89d363c..73bdc89 100644
--- a/ql/src/test/queries/clientpositive/index_bitmap3.q
+++ b/ql/src/test/queries/clientpositive/index_bitmap3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_bitmap_auto.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap_auto.q b/ql/src/test/queries/clientpositive/index_bitmap_auto.q
index 2824094..8020900 100644
--- a/ql/src/test/queries/clientpositive/index_bitmap_auto.q
+++ b/ql/src/test/queries/clientpositive/index_bitmap_auto.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q b/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q
index 2c0b676..c6c558b 100644
--- a/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q
+++ b/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 set hive.fetch.task.conversion=none;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_bitmap_compression.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap_compression.q b/ql/src/test/queries/clientpositive/index_bitmap_compression.q
index 91d04ec..9b0bbe8 100644
--- a/ql/src/test/queries/clientpositive/index_bitmap_compression.q
+++ b/ql/src/test/queries/clientpositive/index_bitmap_compression.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 SET hive.exec.compress.output=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_bitmap_rc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap_rc.q b/ql/src/test/queries/clientpositive/index_bitmap_rc.q
index 681fb29..b8a4f12 100644
--- a/ql/src/test/queries/clientpositive/index_bitmap_rc.q
+++ b/ql/src/test/queries/clientpositive/index_bitmap_rc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_compact.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compact.q b/ql/src/test/queries/clientpositive/index_compact.q
index 5b3a14a..6add673 100644
--- a/ql/src/test/queries/clientpositive/index_compact.q
+++ b/ql/src/test/queries/clientpositive/index_compact.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_compact_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compact_2.q b/ql/src/test/queries/clientpositive/index_compact_2.q
index 80e700c..7b2fce2 100644
--- a/ql/src/test/queries/clientpositive/index_compact_2.q
+++ b/ql/src/test/queries/clientpositive/index_compact_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_compression.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compression.q b/ql/src/test/queries/clientpositive/index_compression.q
index 0702a2b..be93560 100644
--- a/ql/src/test/queries/clientpositive/index_compression.q
+++ b/ql/src/test/queries/clientpositive/index_compression.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.exec.compress.output=true;
 SET hive.stats.dbclass=fs;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_skewtable.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_skewtable.q b/ql/src/test/queries/clientpositive/index_skewtable.q
index fdf65cd..e85e646 100644
--- a/ql/src/test/queries/clientpositive/index_skewtable.q
+++ b/ql/src/test/queries/clientpositive/index_skewtable.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Test creating an index on skewed table
 
 -- Create a skew table

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_stale.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_stale.q b/ql/src/test/queries/clientpositive/index_stale.q
index ecab2b7..488413c 100644
--- a/ql/src/test/queries/clientpositive/index_stale.q
+++ b/ql/src/test/queries/clientpositive/index_stale.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 -- test that stale indexes are not used
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/index_stale_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_stale_partitioned.q b/ql/src/test/queries/clientpositive/index_stale_partitioned.q
index a93ccf7..74411b0 100644
--- a/ql/src/test/queries/clientpositive/index_stale_partitioned.q
+++ b/ql/src/test/queries/clientpositive/index_stale_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 -- Test if index is actually being used.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/infer_bucket_sort.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort.q b/ql/src/test/queries/clientpositive/infer_bucket_sort.q
index 07466fd..3423299 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 
 -- This tests inferring how data is bucketed/sorted from the operators in the reducer

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q b/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q
index 6b656ff..6809b72 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 set hive.exec.infer.bucket.sort.num.buckets.power.two=true;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/infer_bucket_sort_dyn_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_dyn_part.q b/ql/src/test/queries/clientpositive/infer_bucket_sort_dyn_part.q
index 728b8cc..4937be4 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_dyn_part.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_dyn_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 set hive.exec.infer.bucket.sort.num.buckets.power.two=true;
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q b/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q
index e3b8a17..928f6fb 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 
 -- This tests inferring how data is bucketed/sorted from the operators in the reducer

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q b/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q
index becbc9d..3d57083 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 ;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q b/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q
index 41c1a13..f8cde4b 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 set hive.exec.infer.bucket.sort.num.buckets.power.two=true;
 set hive.merge.mapredfiles=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q b/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q
index 090f04f..6824c1c 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 set hive.exec.infer.bucket.sort.num.buckets.power.two=true;
 set hive.exec.reducers.bytes.per.reducer=2500;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/infer_const_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_const_type.q b/ql/src/test/queries/clientpositive/infer_const_type.q
index ce5ed84..583873a 100644
--- a/ql/src/test/queries/clientpositive/infer_const_type.q
+++ b/ql/src/test/queries/clientpositive/infer_const_type.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE infertypes;
 CREATE TABLE infertypes(ti TINYINT, si SMALLINT, i INT, bi BIGINT, fl FLOAT, db DOUBLE, str STRING);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/innerjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/innerjoin.q b/ql/src/test/queries/clientpositive/innerjoin.q
index e0eabc0..dd77ddd 100644
--- a/ql/src/test/queries/clientpositive/innerjoin.q
+++ b/ql/src/test/queries/clientpositive/innerjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input11.q b/ql/src/test/queries/clientpositive/input11.q
index 5aa6ee7..c831357 100644
--- a/ql/src/test/queries/clientpositive/input11.q
+++ b/ql/src/test/queries/clientpositive/input11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input11_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input11_limit.q b/ql/src/test/queries/clientpositive/input11_limit.q
index d58ec83..052a72e 100644
--- a/ql/src/test/queries/clientpositive/input11_limit.q
+++ b/ql/src/test/queries/clientpositive/input11_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input12.q b/ql/src/test/queries/clientpositive/input12.q
index cb540db..b4ec1f1 100644
--- a/ql/src/test/queries/clientpositive/input12.q
+++ b/ql/src/test/queries/clientpositive/input12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapreduce.framework.name=yarn;
 set mapreduce.jobtracker.address=localhost:58;
 set hive.exec.mode.local.auto=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input13.q b/ql/src/test/queries/clientpositive/input13.q
index 620e9dc..02be927 100644
--- a/ql/src/test/queries/clientpositive/input13.q
+++ b/ql/src/test/queries/clientpositive/input13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE;
 CREATE TABLE dest3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input23.q b/ql/src/test/queries/clientpositive/input23.q
index 634699a..9df92b0 100644
--- a/ql/src/test/queries/clientpositive/input23.q
+++ b/ql/src/test/queries/clientpositive/input23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain extended
  select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input26.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input26.q b/ql/src/test/queries/clientpositive/input26.q
index 81af75a..549ab21 100644
--- a/ql/src/test/queries/clientpositive/input26.q
+++ b/ql/src/test/queries/clientpositive/input26.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain
 select * from (
   select * from (select * from srcpart a where a.ds = '2008-04-08' and a.hr = '11' order by a.key limit 5)pa

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input28.q b/ql/src/test/queries/clientpositive/input28.q
index 12e857d..49479ed 100644
--- a/ql/src/test/queries/clientpositive/input28.q
+++ b/ql/src/test/queries/clientpositive/input28.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 create table tst(a string, b string) partitioned by (d string);
 alter table tst add partition (d='2009-01-01');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input2_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input2_limit.q b/ql/src/test/queries/clientpositive/input2_limit.q
index 8104510..a9a324d 100644
--- a/ql/src/test/queries/clientpositive/input2_limit.q
+++ b/ql/src/test/queries/clientpositive/input2_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input30.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input30.q b/ql/src/test/queries/clientpositive/input30.q
index c84c131..7859bbc 100644
--- a/ql/src/test/queries/clientpositive/input30.q
+++ b/ql/src/test/queries/clientpositive/input30.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input31.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input31.q b/ql/src/test/queries/clientpositive/input31.q
index ece9409..56093eb 100644
--- a/ql/src/test/queries/clientpositive/input31.q
+++ b/ql/src/test/queries/clientpositive/input31.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input32.q b/ql/src/test/queries/clientpositive/input32.q
index cdc04b8..6953caa 100644
--- a/ql/src/test/queries/clientpositive/input32.q
+++ b/ql/src/test/queries/clientpositive/input32.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input42.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input42.q b/ql/src/test/queries/clientpositive/input42.q
index 85d66d3..a687450 100644
--- a/ql/src/test/queries/clientpositive/input42.q
+++ b/ql/src/test/queries/clientpositive/input42.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/d13b5db2/ql/src/test/queries/clientpositive/input8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input8.q b/ql/src/test/queries/clientpositive/input8.q
index 66252a9..cf24a55 100644
--- a/ql/src/test/queries/clientpositive/input8.q
+++ b/ql/src/test/queries/clientpositive/input8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(c1 STRING, c2 INT, c3 DOUBLE) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input_part1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part1.q b/ql/src/test/queries/clientpositive/input_part1.q
index b9a210c..0a3a3b4 100644
--- a/ql/src/test/queries/clientpositive/input_part1.q
+++ b/ql/src/test/queries/clientpositive/input_part1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE;
 
 EXPLAIN EXTENDED

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input_part4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part4.q b/ql/src/test/queries/clientpositive/input_part4.q
index 71f27be..7c2e0aa 100644
--- a/ql/src/test/queries/clientpositive/input_part4.q
+++ b/ql/src/test/queries/clientpositive/input_part4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT x.* FROM SRCPART x WHERE x.ds = '2008-04-08' and x.hr = 15;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input_part5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part5.q b/ql/src/test/queries/clientpositive/input_part5.q
index ea9f70b..029aa05 100644
--- a/ql/src/test/queries/clientpositive/input_part5.q
+++ b/ql/src/test/queries/clientpositive/input_part5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 create table tmptable(key string, value string, hr string, ds string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input_part6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part6.q b/ql/src/test/queries/clientpositive/input_part6.q
index a60c7ac..e87fc58 100644
--- a/ql/src/test/queries/clientpositive/input_part6.q
+++ b/ql/src/test/queries/clientpositive/input_part6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT x.* FROM SRCPART x WHERE x.ds = 2008-04-08 LIMIT 10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/input_part9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part9.q b/ql/src/test/queries/clientpositive/input_part9.q
index 8c2eb56..d48f990 100644
--- a/ql/src/test/queries/clientpositive/input_part9.q
+++ b/ql/src/test/queries/clientpositive/input_part9.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/d13b5db2/ql/src/test/queries/clientpositive/insert0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert0.q b/ql/src/test/queries/clientpositive/insert0.q
index 36d01b6..7e687ac 100644
--- a/ql/src/test/queries/clientpositive/insert0.q
+++ b/ql/src/test/queries/clientpositive/insert0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 
 DROP TABLE insert_into1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q b/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q
index 6b00f97..31b0658 100644
--- a/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q
+++ b/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE sourceTable (one string,two string) PARTITIONED BY (ds string,hr string);
 
 load data local inpath '../../data/files/kv1.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='11');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q b/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q
index bd1eb75..85fd987 100644
--- a/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q
+++ b/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE DATABASE db1;
 
 CREATE DATABASE db2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q b/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
index 62cc2f9..2025d53 100644
--- a/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/insert_acid_dynamic_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/d13b5db2/ql/src/test/queries/clientpositive/insert_into2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into2.q b/ql/src/test/queries/clientpositive/insert_into2.q
index d127c04..f3e49ff 100644
--- a/ql/src/test/queries/clientpositive/insert_into2.q
+++ b/ql/src/test/queries/clientpositive/insert_into2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.compute.query.using.stats=true;
 DROP TABLE insert_into2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert_into5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into5.q b/ql/src/test/queries/clientpositive/insert_into5.q
index 07e80ea..358fdf4 100644
--- a/ql/src/test/queries/clientpositive/insert_into5.q
+++ b/ql/src/test/queries/clientpositive/insert_into5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE insert_into5a;
 DROP TABLE insert_into5b;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert_into6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into6.q b/ql/src/test/queries/clientpositive/insert_into6.q
index 2b7988e..1e33c67 100644
--- a/ql/src/test/queries/clientpositive/insert_into6.q
+++ b/ql/src/test/queries/clientpositive/insert_into6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert_into_with_schema.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into_with_schema.q b/ql/src/test/queries/clientpositive/insert_into_with_schema.q
index 69fa9d2..62dfcf6 100644
--- a/ql/src/test/queries/clientpositive/insert_into_with_schema.q
+++ b/ql/src/test/queries/clientpositive/insert_into_with_schema.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- set of tests HIVE-9481
 
 drop database if exists x314 cascade;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert_into_with_schema2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into_with_schema2.q b/ql/src/test/queries/clientpositive/insert_into_with_schema2.q
index 0f21289..032e6ae 100644
--- a/ql/src/test/queries/clientpositive/insert_into_with_schema2.q
+++ b/ql/src/test/queries/clientpositive/insert_into_with_schema2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert_update_delete.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_update_delete.q b/ql/src/test/queries/clientpositive/insert_update_delete.q
index 170a18f..fb00346 100644
--- a/ql/src/test/queries/clientpositive/insert_update_delete.q
+++ b/ql/src/test/queries/clientpositive/insert_update_delete.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/d13b5db2/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q b/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
index 5f8b8b5..24a4f78 100644
--- a/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
+++ b/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition.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/d13b5db2/ql/src/test/queries/clientpositive/insert_values_non_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_values_non_partitioned.q b/ql/src/test/queries/clientpositive/insert_values_non_partitioned.q
index 3b9e98b..75fb309 100644
--- a/ql/src/test/queries/clientpositive/insert_values_non_partitioned.q
+++ b/ql/src/test/queries/clientpositive/insert_values_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;
 


[2/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt4.q b/ql/src/test/queries/clientpositive/skewjoinopt4.q
index 7d5b335..b66a02a 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt4.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt5.q b/ql/src/test/queries/clientpositive/skewjoinopt5.q
index b19b7bc..3024903 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt5.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt6.q b/ql/src/test/queries/clientpositive/skewjoinopt6.q
index 134bf03..152fbe7 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt6.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt7.q b/ql/src/test/queries/clientpositive/skewjoinopt7.q
index 3dd53a3..ba559ca 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt7.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt8.q b/ql/src/test/queries/clientpositive/skewjoinopt8.q
index 917db65..6f9807d 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt8.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt9.q b/ql/src/test/queries/clientpositive/skewjoinopt9.q
index 10cdca4..626b1b2 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt9.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_join_partition_key.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_join_partition_key.q b/ql/src/test/queries/clientpositive/smb_join_partition_key.q
index 49e2d2f..21245cd 100644
--- a/ql/src/test/queries/clientpositive/smb_join_partition_key.q
+++ b/ql/src/test/queries/clientpositive/smb_join_partition_key.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.execution.engine=mr; 
 SET hive.enforce.sortmergebucketmapjoin=false; 
 SET hive.auto.convert.sortmerge.join=true; 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_11.q b/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
index 97e3b08..ccb97b3 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_14.q b/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
index b8b939c..f0b0e6e 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 1;
 
 CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_17.q b/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
index 276bfcc..3374693 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_25.q b/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
index 498d337..834d44c 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_6.q b/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
index b50c494..ab95b46 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 1;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_7.q b/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
index d192036..bd859b7 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 1;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats1.q b/ql/src/test/queries/clientpositive/stats1.q
index dd35608..e5133c8 100644
--- a/ql/src/test/queries/clientpositive/stats1.q
+++ b/ql/src/test/queries/clientpositive/stats1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=true;
 set hive.merge.mapfiles=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats10.q b/ql/src/test/queries/clientpositive/stats10.q
index 2ad6a4f..1732f36 100644
--- a/ql/src/test/queries/clientpositive/stats10.q
+++ b/ql/src/test/queries/clientpositive/stats10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=true;
 ;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats3.q b/ql/src/test/queries/clientpositive/stats3.q
index fd7e0ea..93162de 100644
--- a/ql/src/test/queries/clientpositive/stats3.q
+++ b/ql/src/test/queries/clientpositive/stats3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=true;
 drop table hive_test_src;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats_only_null.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_only_null.q b/ql/src/test/queries/clientpositive/stats_only_null.q
index 29ff5f8..7fd22c5 100644
--- a/ql/src/test/queries/clientpositive/stats_only_null.q
+++ b/ql/src/test/queries/clientpositive/stats_only_null.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.stats.dbclass=fs;
 set hive.compute.query.using.stats=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats_ppr_all.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_ppr_all.q b/ql/src/test/queries/clientpositive/stats_ppr_all.q
index b611e83..12a2012 100644
--- a/ql/src/test/queries/clientpositive/stats_ppr_all.q
+++ b/ql/src/test/queries/clientpositive/stats_ppr_all.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.fetch.column.stats=true;
 
 drop table ss;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/storage_format_descriptor.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/storage_format_descriptor.q b/ql/src/test/queries/clientpositive/storage_format_descriptor.q
index 548890f..2e4d73d 100644
--- a/ql/src/test/queries/clientpositive/storage_format_descriptor.q
+++ b/ql/src/test/queries/clientpositive/storage_format_descriptor.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE stored_as_custom_text_serde;
 CREATE TABLE stored_as_custom_text_serde(key string, value string) STORED AS customtextserde;
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE stored_as_custom_text_serde;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/str_to_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/str_to_map.q b/ql/src/test/queries/clientpositive/str_to_map.q
index cc5ecf2..f2993b1 100644
--- a/ql/src/test/queries/clientpositive/str_to_map.q
+++ b/ql/src/test/queries/clientpositive/str_to_map.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 -- JAVA_VERSION_SPECIFIC_OUTPUT

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subq.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq.q b/ql/src/test/queries/clientpositive/subq.q
index 14fa321..678620f 100644
--- a/ql/src/test/queries/clientpositive/subq.q
+++ b/ql/src/test/queries/clientpositive/subq.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 FROM (
   FROM src select src.* WHERE src.key < 100

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subq2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq2.q b/ql/src/test/queries/clientpositive/subq2.q
index 7e174da..98e663b 100644
--- a/ql/src/test/queries/clientpositive/subq2.q
+++ b/ql/src/test/queries/clientpositive/subq2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT a.k, a.c
 FROM (SELECT b.key as k, count(1) as c FROM src b GROUP BY b.key) a

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subq_where_serialization.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq_where_serialization.q b/ql/src/test/queries/clientpositive/subq_where_serialization.q
index 1d53982..91290c4 100644
--- a/ql/src/test/queries/clientpositive/subq_where_serialization.q
+++ b/ql/src/test/queries/clientpositive/subq_where_serialization.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask.size=10000000;
 explain select src.key from src where src.key in ( select distinct key from src);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_alias.q b/ql/src/test/queries/clientpositive/subquery_alias.q
index ffc33dc..fcdb64c 100644
--- a/ql/src/test/queries/clientpositive/subquery_alias.q
+++ b/ql/src/test/queries/clientpositive/subquery_alias.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 FROM (
   FROM src select src.* WHERE src.key < 100

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_exists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_exists.q b/ql/src/test/queries/clientpositive/subquery_exists.q
index 720e360..dfae49d 100644
--- a/ql/src/test/queries/clientpositive/subquery_exists.q
+++ b/ql/src/test/queries/clientpositive/subquery_exists.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/d13b5db2/ql/src/test/queries/clientpositive/subquery_exists_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_exists_having.q b/ql/src/test/queries/clientpositive/subquery_exists_having.q
index 39d2d17..878a0cb 100644
--- a/ql/src/test/queries/clientpositive/subquery_exists_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_exists_having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.correlation=false;
 
 -- no agg, corr

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_in.q b/ql/src/test/queries/clientpositive/subquery_in.q
index e81872f..c01ae70 100644
--- a/ql/src/test/queries/clientpositive/subquery_in.q
+++ b/ql/src/test/queries/clientpositive/subquery_in.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/d13b5db2/ql/src/test/queries/clientpositive/subquery_in_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_in_having.q b/ql/src/test/queries/clientpositive/subquery_in_having.q
index af87eb4..2433556 100644
--- a/ql/src/test/queries/clientpositive/subquery_in_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_in_having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 -- data setup

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_multiinsert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_multiinsert.q b/ql/src/test/queries/clientpositive/subquery_multiinsert.q
index 06763f0..bea2e13 100644
--- a/ql/src/test/queries/clientpositive/subquery_multiinsert.q
+++ b/ql/src/test/queries/clientpositive/subquery_multiinsert.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_notexists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notexists.q b/ql/src/test/queries/clientpositive/subquery_notexists.q
index 43a801f..2d7e9ce 100644
--- a/ql/src/test/queries/clientpositive/subquery_notexists.q
+++ b/ql/src/test/queries/clientpositive/subquery_notexists.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 -- no agg, corr

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_notexists_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notexists_having.q b/ql/src/test/queries/clientpositive/subquery_notexists_having.q
index 7205d17..24b0a66 100644
--- a/ql/src/test/queries/clientpositive/subquery_notexists_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_notexists_having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 -- no agg, corr

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_notin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notin.q b/ql/src/test/queries/clientpositive/subquery_notin.q
index c75e082..3f4fb7f 100644
--- a/ql/src/test/queries/clientpositive/subquery_notin.q
+++ b/ql/src/test/queries/clientpositive/subquery_notin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- non agg, non corr
 explain
 select * 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_notin_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notin_having.q b/ql/src/test/queries/clientpositive/subquery_notin_having.q
index 1494d1e..8b2914d 100644
--- a/ql/src/test/queries/clientpositive/subquery_notin_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_notin_having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- non agg, non corr
 -- JAVA_VERSION_SPECIFIC_OUTPUT
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q b/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
index 1d766a1..78a8b20 100644
--- a/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
+++ b/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 explain 
 select * from src tablesample (10 rows) where lower(key) in (select key from src);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q b/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
index d2b4c36..bdfa648 100644
--- a/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
+++ b/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table src11 (key1 string, value1 string);
 
 create table part2( 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_views.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_views.q b/ql/src/test/queries/clientpositive/subquery_views.q
index e646310..87c055b 100644
--- a/ql/src/test/queries/clientpositive/subquery_views.q
+++ b/ql/src/test/queries/clientpositive/subquery_views.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 -- exists test

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/sum_expr_with_order.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sum_expr_with_order.q b/ql/src/test/queries/clientpositive/sum_expr_with_order.q
index 4de9837..d3e9ea5 100644
--- a/ql/src/test/queries/clientpositive/sum_expr_with_order.q
+++ b/ql/src/test/queries/clientpositive/sum_expr_with_order.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 select 
 cast(sum(key)*100 as decimal(15,3)) as c1

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/symlink_text_input_format.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/symlink_text_input_format.q b/ql/src/test/queries/clientpositive/symlink_text_input_format.q
index d633b97..521a617 100644
--- a/ql/src/test/queries/clientpositive/symlink_text_input_format.q
+++ b/ql/src/test/queries/clientpositive/symlink_text_input_format.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS symlink_text_input_format;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/table_access_keys_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/table_access_keys_stats.q b/ql/src/test/queries/clientpositive/table_access_keys_stats.q
index 7bd0422..2339121 100644
--- a/ql/src/test/queries/clientpositive/table_access_keys_stats.q
+++ b/ql/src/test/queries/clientpositive/table_access_keys_stats.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.CheckTableAccessHook;
 SET hive.stats.collect.tablekeys=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/table_nonprintable.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/table_nonprintable.q b/ql/src/test/queries/clientpositive/table_nonprintable.q
index 5ae228e..56ede0a 100644
--- a/ql/src/test/queries/clientpositive/table_nonprintable.q
+++ b/ql/src/test/queries/clientpositive/table_nonprintable.q
@@ -1,5 +1,5 @@
 set hive.msck.path.validation=skip;
-
+set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/temp_table_external/day=¢Bar;
 dfs -copyFromLocal ../../data/files/in1.txt hdfs:///tmp/temp_table_external/day=¢Bar;
 dfs -ls hdfs:///tmp/temp_table_external/day=¢Bar;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tablename_with_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tablename_with_select.q b/ql/src/test/queries/clientpositive/tablename_with_select.q
index c48231b..e4aee3c 100644
--- a/ql/src/test/queries/clientpositive/tablename_with_select.q
+++ b/ql/src/test/queries/clientpositive/tablename_with_select.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 CREATE TABLE tmp_select(a INT, b STRING);
 DESCRIBE tmp_select;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/temp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table.q b/ql/src/test/queries/clientpositive/temp_table.q
index 65f3eb4..f820d67 100644
--- a/ql/src/test/queries/clientpositive/temp_table.q
+++ b/ql/src/test/queries/clientpositive/temp_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 EXPLAIN CREATE TEMPORARY TABLE foo AS SELECT * FROM src WHERE key % 2 = 0;
 CREATE TEMPORARY TABLE foo AS SELECT * FROM src WHERE key % 2 = 0;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/temp_table_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table_join1.q b/ql/src/test/queries/clientpositive/temp_table_join1.q
index e1b7e15..e77d228 100644
--- a/ql/src/test/queries/clientpositive/temp_table_join1.q
+++ b/ql/src/test/queries/clientpositive/temp_table_join1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE src_nontemp AS SELECT * FROM src limit 10;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_dml.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dml.q b/ql/src/test/queries/clientpositive/tez_dml.q
index 10c8854..816da5d 100644
--- a/ql/src/test/queries/clientpositive/tez_dml.q
+++ b/ql/src/test/queries/clientpositive/tez_dml.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.exec.dynamic.partition.mode=nonstrict;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
index e3325c4..fc0edec 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.explain.user=false;
 set hive.auto.convert.join=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
index af4e2b8..2c36189 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.explain.user=false;
 set hive.auto.convert.join=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
index 1994b40..cecbbd7 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
@@ -4,7 +4,7 @@ set hive.optimize.limitjointranspose.reductiontuples=100;
 set hive.explain.user=false;
 set hive.auto.convert.join=false;
 set hive.optimize.dynamic.partition.hashjoin=false;
-
+set hive.mapred.mode=nonstrict;
 explain
 select a.*
 from alltypesorc a left outer join src b

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_fsstat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_fsstat.q b/ql/src/test/queries/clientpositive/tez_fsstat.q
index 35d1f58..c7851a1 100644
--- a/ql/src/test/queries/clientpositive/tez_fsstat.q
+++ b/ql/src/test/queries/clientpositive/tez_fsstat.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.execution.engine=tez;
 CREATE TABLE tab_part (key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 CREATE TABLE t1 (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/d13b5db2/ql/src/test/queries/clientpositive/tez_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join.q b/ql/src/test/queries/clientpositive/tez_join.q
index d590959..107080d 100644
--- a/ql/src/test/queries/clientpositive/tez_join.q
+++ b/ql/src/test/queries/clientpositive/tez_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.sortmerge.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_join_hash.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_hash.q b/ql/src/test/queries/clientpositive/tez_join_hash.q
index 09a1d8b..f2808b8 100644
--- a/ql/src/test/queries/clientpositive/tez_join_hash.q
+++ b/ql/src/test/queries/clientpositive/tez_join_hash.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/d13b5db2/ql/src/test/queries/clientpositive/tez_join_result_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_result_complex.q b/ql/src/test/queries/clientpositive/tez_join_result_complex.q
index 5bc9151..42c5506 100644
--- a/ql/src/test/queries/clientpositive/tez_join_result_complex.q
+++ b/ql/src/test/queries/clientpositive/tez_join_result_complex.q
@@ -2,7 +2,7 @@ SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;
 SET hive.auto.convert.join.noconditionaltask.size=1000000000;
 set hive.mapjoin.optimized.hashtable=true;
-
+set hive.mapred.mode=nonstrict;
 create table service_request_clean(
 cnctevn_id          	string              ,
 svcrqst_id          	string              ,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_join_tests.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_tests.q b/ql/src/test/queries/clientpositive/tez_join_tests.q
index ff42f13..9a62805 100644
--- a/ql/src/test/queries/clientpositive/tez_join_tests.q
+++ b/ql/src/test/queries/clientpositive/tez_join_tests.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/d13b5db2/ql/src/test/queries/clientpositive/tez_joins_explain.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_joins_explain.q b/ql/src/test/queries/clientpositive/tez_joins_explain.q
index 3187e79..5f26ee2 100644
--- a/ql/src/test/queries/clientpositive/tez_joins_explain.q
+++ b/ql/src/test/queries/clientpositive/tez_joins_explain.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_schema_evolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_schema_evolution.q b/ql/src/test/queries/clientpositive/tez_schema_evolution.q
index 632878a..d855cd2 100644
--- a/ql/src/test/queries/clientpositive/tez_schema_evolution.q
+++ b/ql/src/test/queries/clientpositive/tez_schema_evolution.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 create table test (key int, value string) partitioned by (p int) stored as textfile;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_self_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_self_join.q b/ql/src/test/queries/clientpositive/tez_self_join.q
index 093491d..bde56bd 100644
--- a/ql/src/test/queries/clientpositive/tez_self_join.q
+++ b/ql/src/test/queries/clientpositive/tez_self_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 drop table if exists tez_self_join1;
 drop table if exists tez_self_join2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_smb_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_smb_1.q b/ql/src/test/queries/clientpositive/tez_smb_1.q
index b8147b8..089ffe3 100644
--- a/ql/src/test/queries/clientpositive/tez_smb_1.q
+++ b/ql/src/test/queries/clientpositive/tez_smb_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=true;
 set hive.join.emit.interval=2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_smb_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_smb_empty.q b/ql/src/test/queries/clientpositive/tez_smb_empty.q
index 67acbcc..4661ada 100644
--- a/ql/src/test/queries/clientpositive/tez_smb_empty.q
+++ b/ql/src/test/queries/clientpositive/tez_smb_empty.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.mapjoin.hybridgrace.hashtable=false;
 set hive.join.emit.interval=2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_smb_main.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_smb_main.q b/ql/src/test/queries/clientpositive/tez_smb_main.q
index 44bb1d8..1890aa7 100644
--- a/ql/src/test/queries/clientpositive/tez_smb_main.q
+++ b/ql/src/test/queries/clientpositive/tez_smb_main.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.join.emit.interval=2;
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union.q b/ql/src/test/queries/clientpositive/tez_union.q
index 2211f77..c49c96d 100644
--- a/ql/src/test/queries/clientpositive/tez_union.q
+++ b/ql/src/test/queries/clientpositive/tez_union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q b/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
index e022d81..782fc1e 100644
--- a/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 create table dummy(i int);
 insert into table dummy values (1);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
index 65fee16..22c5f9d 100644
--- a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.explain.user=false;
 set hive.auto.convert.join=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
index 606f455..e3d1830 100644
--- a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
+++ b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.explain.user=false;
 set hive.auto.convert.join=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/timestamp_lazy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/timestamp_lazy.q b/ql/src/test/queries/clientpositive/timestamp_lazy.q
index e9a0cfa..e72d82e 100644
--- a/ql/src/test/queries/clientpositive/timestamp_lazy.q
+++ b/ql/src/test/queries/clientpositive/timestamp_lazy.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table timestamp_lazy;
 create table timestamp_lazy (t timestamp, key string, value string);
 insert overwrite table timestamp_lazy select cast('2011-01-01 01:01:01' as timestamp), key, value from src tablesample (5 rows);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/topn.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/topn.q b/ql/src/test/queries/clientpositive/topn.q
index 4821b5a..509a7ab 100644
--- a/ql/src/test/queries/clientpositive/topn.q
+++ b/ql/src/test/queries/clientpositive/topn.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE `sample_07` ( `code` string , `description` string , `total_emp` int , `salary` int ) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TextFile;
 set hive.limit.pushdown.memory.usage=0.9999999;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/transform_ppr1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/transform_ppr1.q b/ql/src/test/queries/clientpositive/transform_ppr1.q
index 5156aba..5d0a48b 100644
--- a/ql/src/test/queries/clientpositive/transform_ppr1.q
+++ b/ql/src/test/queries/clientpositive/transform_ppr1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.entity.capture.transform=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/truncate_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column.q b/ql/src/test/queries/clientpositive/truncate_column.q
index 0bfb23e..4cfa180 100644
--- a/ql/src/test/queries/clientpositive/truncate_column.q
+++ b/ql/src/test/queries/clientpositive/truncate_column.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Tests truncating column(s) from a table, also tests that stats are updated
 
 CREATE TABLE test_tab (key STRING, value STRING) 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/truncate_column_buckets.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_buckets.q b/ql/src/test/queries/clientpositive/truncate_column_buckets.q
index 4375843..1cda1bf 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_buckets.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_buckets.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Tests truncating columns from a bucketed table, table should remain bucketed
 
 CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q b/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
index 4067c5f..476120a 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 set hive.merge.mapfiles=false;	
 set hive.merge.mapredfiles=false; 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/truncate_column_merge.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_merge.q b/ql/src/test/queries/clientpositive/truncate_column_merge.q
index 7a59efc..c11b7f6 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_merge.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_merge.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Tests truncating a column from a table with multiple files, then merging those files
 
 CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/type_widening.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/type_widening.q b/ql/src/test/queries/clientpositive/type_widening.q
index b18c014..b504cf9 100644
--- a/ql/src/test/queries/clientpositive/type_widening.q
+++ b/ql/src/test/queries/clientpositive/type_widening.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 -- Check for int, bigint automatic type widening conversions in UDFs, UNIONS
 EXPLAIN SELECT COALESCE(0, 9223372036854775807) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udaf_corr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_corr.q b/ql/src/test/queries/clientpositive/udaf_corr.q
index a2edec4..5e9840e 100644
--- a/ql/src/test/queries/clientpositive/udaf_corr.q
+++ b/ql/src/test/queries/clientpositive/udaf_corr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE covar_tab;
 CREATE TABLE covar_tab (a INT, b INT, c INT)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udaf_covar_pop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_covar_pop.q b/ql/src/test/queries/clientpositive/udaf_covar_pop.q
index e5879d4..4408107 100644
--- a/ql/src/test/queries/clientpositive/udaf_covar_pop.q
+++ b/ql/src/test/queries/clientpositive/udaf_covar_pop.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE covar_tab;
 CREATE TABLE covar_tab (a INT, b INT, c INT)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udaf_covar_samp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_covar_samp.q b/ql/src/test/queries/clientpositive/udaf_covar_samp.q
index 61f951a..9caf421 100644
--- a/ql/src/test/queries/clientpositive/udaf_covar_samp.q
+++ b/ql/src/test/queries/clientpositive/udaf_covar_samp.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE covar_tab;
 CREATE TABLE covar_tab (a INT, b INT, c INT)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q b/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
index 3685b1e..aa4a4ce 100644
--- a/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
+++ b/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- 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/d13b5db2/ql/src/test/queries/clientpositive/udf1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf1.q b/ql/src/test/queries/clientpositive/udf1.q
index 2292c3f..9df913d 100644
--- a/ql/src/test/queries/clientpositive/udf1.q
+++ b/ql/src/test/queries/clientpositive/udf1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING,
   c5 STRING, c6 STRING, c7 STRING, c8 STRING,
   c9 STRING, c10 STRING, c11 STRING, c12 STRING, c13 STRING,

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

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf9.q b/ql/src/test/queries/clientpositive/udf9.q
index 3b179b3..6e76f52 100644
--- a/ql/src/test/queries/clientpositive/udf9.q
+++ b/ql/src/test/queries/clientpositive/udf9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT DATEDIFF('2008-12-31', '2009-01-01'), DATEDIFF('2008-03-01', '2008-02-28'),
        DATEDIFF('2007-03-01', '2007-01-28'), DATEDIFF('2008-03-01 23:59:59', '2008-03-02 00:00:00'),

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_10_trims.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_10_trims.q b/ql/src/test/queries/clientpositive/udf_10_trims.q
index 8a7e3a5..92488fa 100644
--- a/ql/src/test/queries/clientpositive/udf_10_trims.q
+++ b/ql/src/test/queries/clientpositive/udf_10_trims.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_between.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_between.q b/ql/src/test/queries/clientpositive/udf_between.q
index b22ee9c..cba8d31 100644
--- a/ql/src/test/queries/clientpositive/udf_between.q
+++ b/ql/src/test/queries/clientpositive/udf_between.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 describe function between;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_case_column_pruning.q b/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
index da92551..d6c9e9d 100644
--- a/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
+++ b/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT CASE a.key
         WHEN '1' THEN 2

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_folder_constants.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_folder_constants.q b/ql/src/test/queries/clientpositive/udf_folder_constants.q
index fcb5162..d616a04 100644
--- a/ql/src/test/queries/clientpositive/udf_folder_constants.q
+++ b/ql/src/test/queries/clientpositive/udf_folder_constants.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table if exists udf_tb1;
 drop table if exists udf_tb2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_hour.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_hour.q b/ql/src/test/queries/clientpositive/udf_hour.q
index b9811e6..43d23c7 100644
--- a/ql/src/test/queries/clientpositive/udf_hour.q
+++ b/ql/src/test/queries/clientpositive/udf_hour.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION hour;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_like.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_like.q b/ql/src/test/queries/clientpositive/udf_like.q
index 12983bd..c70cbdd 100644
--- a/ql/src/test/queries/clientpositive/udf_like.q
+++ b/ql/src/test/queries/clientpositive/udf_like.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION like;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_lower.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_lower.q b/ql/src/test/queries/clientpositive/udf_lower.q
index c07d2db..e30fa69 100644
--- a/ql/src/test/queries/clientpositive/udf_lower.q
+++ b/ql/src/test/queries/clientpositive/udf_lower.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DESCRIBE FUNCTION lower;
 DESCRIBE FUNCTION EXTENDED lower;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_minute.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_minute.q b/ql/src/test/queries/clientpositive/udf_minute.q
index 0e4d855..c5d55ee 100644
--- a/ql/src/test/queries/clientpositive/udf_minute.q
+++ b/ql/src/test/queries/clientpositive/udf_minute.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DESCRIBE FUNCTION minute;
 DESCRIBE FUNCTION EXTENDED minute;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_parse_url.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_parse_url.q b/ql/src/test/queries/clientpositive/udf_parse_url.q
index 62c67db..e834fd7 100644
--- a/ql/src/test/queries/clientpositive/udf_parse_url.q
+++ b/ql/src/test/queries/clientpositive/udf_parse_url.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DESCRIBE FUNCTION parse_url;
 DESCRIBE FUNCTION EXTENDED parse_url;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_reflect2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_reflect2.q b/ql/src/test/queries/clientpositive/udf_reflect2.q
index a65294b..255dcdb 100644
--- a/ql/src/test/queries/clientpositive/udf_reflect2.q
+++ b/ql/src/test/queries/clientpositive/udf_reflect2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION reflect2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_second.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_second.q b/ql/src/test/queries/clientpositive/udf_second.q
index f63426d..8cbc2f0 100644
--- a/ql/src/test/queries/clientpositive/udf_second.q
+++ b/ql/src/test/queries/clientpositive/udf_second.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION second;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_sentences.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_sentences.q b/ql/src/test/queries/clientpositive/udf_sentences.q
index 009e4cb..97a3f18 100644
--- a/ql/src/test/queries/clientpositive/udf_sentences.q
+++ b/ql/src/test/queries/clientpositive/udf_sentences.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE sent_tmp (val array<string>);
 CREATE TABLE sent_tmp2 (val string);
 INSERT OVERWRITE TABLE sent_tmp

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_unix_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_unix_timestamp.q b/ql/src/test/queries/clientpositive/udf_unix_timestamp.q
index bb598c2..a0bc08b 100644
--- a/ql/src/test/queries/clientpositive/udf_unix_timestamp.q
+++ b/ql/src/test/queries/clientpositive/udf_unix_timestamp.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION unix_timestamp;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udtf_explode.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_explode.q b/ql/src/test/queries/clientpositive/udtf_explode.q
index db9018c..cc69dbe 100644
--- a/ql/src/test/queries/clientpositive/udtf_explode.q
+++ b/ql/src/test/queries/clientpositive/udtf_explode.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION explode;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udtf_json_tuple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_json_tuple.q b/ql/src/test/queries/clientpositive/udtf_json_tuple.q
index 93d829d..a46905c 100644
--- a/ql/src/test/queries/clientpositive/udtf_json_tuple.q
+++ b/ql/src/test/queries/clientpositive/udtf_json_tuple.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table json_t (key string, jstring string);
 
 insert overwrite table json_t

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q b/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
index 0870cbc..69ee7be 100644
--- a/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
+++ b/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table url_t (key string, fullurl string);
 
 insert overwrite table url_t

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union.q b/ql/src/test/queries/clientpositive/union.q
index f1bf126..69e430f 100644
--- a/ql/src/test/queries/clientpositive/union.q
+++ b/ql/src/test/queries/clientpositive/union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_BEFORE_DIFF
 -- union case: both subqueries are map jobs on same input, followed by filesink
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union10.q b/ql/src/test/queries/clientpositive/union10.q
index 7860980..7d971be 100644
--- a/ql/src/test/queries/clientpositive/union10.q
+++ b/ql/src/test/queries/clientpositive/union10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr = true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union11.q b/ql/src/test/queries/clientpositive/union11.q
index 1f11ff6..ac00ab6 100644
--- a/ql/src/test/queries/clientpositive/union11.q
+++ b/ql/src/test/queries/clientpositive/union11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr = true;
 -- SORT_BEFORE_DIFF
 -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union12.q b/ql/src/test/queries/clientpositive/union12.q
index de0acd2..418ec2d 100644
--- a/ql/src/test/queries/clientpositive/union12.q
+++ b/ql/src/test/queries/clientpositive/union12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr = true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union13.q b/ql/src/test/queries/clientpositive/union13.q
index c9cee66..e4fe2bf 100644
--- a/ql/src/test/queries/clientpositive/union13.q
+++ b/ql/src/test/queries/clientpositive/union13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_BEFORE_DIFF
 -- union case: both subqueries are a map-only jobs, same input, followed by filesink
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union14.q b/ql/src/test/queries/clientpositive/union14.q
index ccd1444..01a352e 100644
--- a/ql/src/test/queries/clientpositive/union14.q
+++ b/ql/src/test/queries/clientpositive/union14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr = true;
 -- SORT_BEFORE_DIFF
 -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union15.q b/ql/src/test/queries/clientpositive/union15.q
index 65eceeb..1dea476 100644
--- a/ql/src/test/queries/clientpositive/union15.q
+++ b/ql/src/test/queries/clientpositive/union15.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr = true;
 -- SORT_BEFORE_DIFF
 -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union16.q b/ql/src/test/queries/clientpositive/union16.q
index bf15fc9..bafcba9 100644
--- a/ql/src/test/queries/clientpositive/union16.q
+++ b/ql/src/test/queries/clientpositive/union16.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_BEFORE_DIFF
 EXPLAIN
 SELECT count(1) FROM (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union2.q b/ql/src/test/queries/clientpositive/union2.q
index 58765c7..4884d18 100644
--- a/ql/src/test/queries/clientpositive/union2.q
+++ b/ql/src/test/queries/clientpositive/union2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_BEFORE_DIFF
 -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union20.q b/ql/src/test/queries/clientpositive/union20.q
index e7d99bd..66f94ad 100644
--- a/ql/src/test/queries/clientpositive/union20.q
+++ b/ql/src/test/queries/clientpositive/union20.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- union :map-reduce sub-queries followed by join
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union22.q b/ql/src/test/queries/clientpositive/union22.q
index 7477d2c..d6937f7 100644
--- a/ql/src/test/queries/clientpositive/union22.q
+++ b/ql/src/test/queries/clientpositive/union22.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union23.q b/ql/src/test/queries/clientpositive/union23.q
index 41dca46..052f34a 100644
--- a/ql/src/test/queries/clientpositive/union23.q
+++ b/ql/src/test/queries/clientpositive/union23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain
 select s.key2, s.value2
 from (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union24.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union24.q b/ql/src/test/queries/clientpositive/union24.q
index 0564a3a..073ceeb 100644
--- a/ql/src/test/queries/clientpositive/union24.q
+++ b/ql/src/test/queries/clientpositive/union24.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 create table src2 as select key, count(1) as count from src group by key;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union25.q b/ql/src/test/queries/clientpositive/union25.q
index 04e782e..5c5687c 100644
--- a/ql/src/test/queries/clientpositive/union25.q
+++ b/ql/src/test/queries/clientpositive/union25.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table tmp_srcpart like srcpart;
 
 insert overwrite table tmp_srcpart partition (ds='2008-04-08', hr='11')

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union27.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union27.q b/ql/src/test/queries/clientpositive/union27.q
index 8f3af6b..19fab80 100644
--- a/ql/src/test/queries/clientpositive/union27.q
+++ b/ql/src/test/queries/clientpositive/union27.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 create table jackson_sev_same as select * from src;
 create table dim_pho as select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union28.q b/ql/src/test/queries/clientpositive/union28.q
index 6aebfeb..f099c3a 100644
--- a/ql/src/test/queries/clientpositive/union28.q
+++ b/ql/src/test/queries/clientpositive/union28.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table union_subq_union(key int, value string);
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union30.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union30.q b/ql/src/test/queries/clientpositive/union30.q
index 9763bc3..0072dae 100644
--- a/ql/src/test/queries/clientpositive/union30.q
+++ b/ql/src/test/queries/clientpositive/union30.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table union_subq_union(key int, value string);
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union32.q b/ql/src/test/queries/clientpositive/union32.q
index 86e97d7..f47f0af 100644
--- a/ql/src/test/queries/clientpositive/union32.q
+++ b/ql/src/test/queries/clientpositive/union32.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 -- This tests various union queries which have columns on one side of the query

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union33.q b/ql/src/test/queries/clientpositive/union33.q
index 90a7a3d..017442e 100644
--- a/ql/src/test/queries/clientpositive/union33.q
+++ b/ql/src/test/queries/clientpositive/union33.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.groupby.skewindata=true;
 -- SORT_BEFORE_DIFF
 -- This tests that a union all with a map only subquery on one side and a 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union34.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union34.q b/ql/src/test/queries/clientpositive/union34.q
index 238b583..2ab16de 100644
--- a/ql/src/test/queries/clientpositive/union34.q
+++ b/ql/src/test/queries/clientpositive/union34.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table src10_1 (key string, value string);
 create table src10_2 (key string, value string);
 create table src10_3 (key string, value string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union36.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union36.q b/ql/src/test/queries/clientpositive/union36.q
index e929749..c38e7b1 100644
--- a/ql/src/test/queries/clientpositive/union36.q
+++ b/ql/src/test/queries/clientpositive/union36.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=false;
 
 select (x/sum(x) over())  as y from(select cast(1 as decimal(10,0))  as x from (select * from src limit 2)s1 union all select cast(1 as decimal(10,0)) x from (select * from src limit 2) s2 union all select '100000000' x from (select * from src limit 2) s3)u order by y;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union4.q b/ql/src/test/queries/clientpositive/union4.q
index 5e4f6fd..a5eefde 100644
--- a/ql/src/test/queries/clientpositive/union4.q
+++ b/ql/src/test/queries/clientpositive/union4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.map.aggr = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union5.q b/ql/src/test/queries/clientpositive/union5.q
index b495d01..edfd1ca 100644
--- a/ql/src/test/queries/clientpositive/union5.q
+++ b/ql/src/test/queries/clientpositive/union5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.map.aggr = true;
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union6.q b/ql/src/test/queries/clientpositive/union6.q
index 87347b1..9d18421 100644
--- a/ql/src/test/queries/clientpositive/union6.q
+++ b/ql/src/test/queries/clientpositive/union6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.map.aggr = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union7.q b/ql/src/test/queries/clientpositive/union7.q
index 872b09e..9ecab8e 100644
--- a/ql/src/test/queries/clientpositive/union7.q
+++ b/ql/src/test/queries/clientpositive/union7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.map.aggr = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union8.q b/ql/src/test/queries/clientpositive/union8.q
index bc5f3b1..e26cdd9 100644
--- a/ql/src/test/queries/clientpositive/union8.q
+++ b/ql/src/test/queries/clientpositive/union8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_BEFORE_DIFF
 -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union9.q b/ql/src/test/queries/clientpositive/union9.q
index 064cf10..de6490c 100644
--- a/ql/src/test/queries/clientpositive/union9.q
+++ b/ql/src/test/queries/clientpositive/union9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_BEFORE_DIFF
 -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink

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

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_1.q b/ql/src/test/queries/clientpositive/union_remove_1.q
index 2b1a99b..702f71a 100644
--- a/ql/src/test/queries/clientpositive/union_remove_1.q
+++ b/ql/src/test/queries/clientpositive/union_remove_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_10.q b/ql/src/test/queries/clientpositive/union_remove_10.q
index a00599c..508f354 100644
--- a/ql/src/test/queries/clientpositive/union_remove_10.q
+++ b/ql/src/test/queries/clientpositive/union_remove_10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_11.q b/ql/src/test/queries/clientpositive/union_remove_11.q
index a6378f7..bdfbf66 100644
--- a/ql/src/test/queries/clientpositive/union_remove_11.q
+++ b/ql/src/test/queries/clientpositive/union_remove_11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_12.q b/ql/src/test/queries/clientpositive/union_remove_12.q
index ca4885a..f6436f5 100644
--- a/ql/src/test/queries/clientpositive/union_remove_12.q
+++ b/ql/src/test/queries/clientpositive/union_remove_12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_13.q b/ql/src/test/queries/clientpositive/union_remove_13.q
index 4fcec6b..b02451b 100644
--- a/ql/src/test/queries/clientpositive/union_remove_13.q
+++ b/ql/src/test/queries/clientpositive/union_remove_13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_14.q b/ql/src/test/queries/clientpositive/union_remove_14.q
index 0044db3..bec6226 100644
--- a/ql/src/test/queries/clientpositive/union_remove_14.q
+++ b/ql/src/test/queries/clientpositive/union_remove_14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_15.q b/ql/src/test/queries/clientpositive/union_remove_15.q
index ca5706d..e384739 100644
--- a/ql/src/test/queries/clientpositive/union_remove_15.q
+++ b/ql/src/test/queries/clientpositive/union_remove_15.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_16.q b/ql/src/test/queries/clientpositive/union_remove_16.q
index ebb0a5f..41305bf 100644
--- a/ql/src/test/queries/clientpositive/union_remove_16.q
+++ b/ql/src/test/queries/clientpositive/union_remove_16.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_17.q b/ql/src/test/queries/clientpositive/union_remove_17.q
index 20cf534..8f91d03 100644
--- a/ql/src/test/queries/clientpositive/union_remove_17.q
+++ b/ql/src/test/queries/clientpositive/union_remove_17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_18.q b/ql/src/test/queries/clientpositive/union_remove_18.q
index f5cbed2..ad38742 100644
--- a/ql/src/test/queries/clientpositive/union_remove_18.q
+++ b/ql/src/test/queries/clientpositive/union_remove_18.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_19.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_19.q b/ql/src/test/queries/clientpositive/union_remove_19.q
index 6244eb0..34f8b5a 100644
--- a/ql/src/test/queries/clientpositive/union_remove_19.q
+++ b/ql/src/test/queries/clientpositive/union_remove_19.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_2.q b/ql/src/test/queries/clientpositive/union_remove_2.q
index a9cd571..274608c 100644
--- a/ql/src/test/queries/clientpositive/union_remove_2.q
+++ b/ql/src/test/queries/clientpositive/union_remove_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_20.q b/ql/src/test/queries/clientpositive/union_remove_20.q
index 3c19c59..93a49f3 100644
--- a/ql/src/test/queries/clientpositive/union_remove_20.q
+++ b/ql/src/test/queries/clientpositive/union_remove_20.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_21.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_21.q b/ql/src/test/queries/clientpositive/union_remove_21.q
index f7a1e0f..fa8ff27 100644
--- a/ql/src/test/queries/clientpositive/union_remove_21.q
+++ b/ql/src/test/queries/clientpositive/union_remove_21.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_22.q b/ql/src/test/queries/clientpositive/union_remove_22.q
index 981f440..0e97cae 100644
--- a/ql/src/test/queries/clientpositive/union_remove_22.q
+++ b/ql/src/test/queries/clientpositive/union_remove_22.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_23.q b/ql/src/test/queries/clientpositive/union_remove_23.q
index 7f741f7..436719d 100644
--- a/ql/src/test/queries/clientpositive/union_remove_23.q
+++ b/ql/src/test/queries/clientpositive/union_remove_23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_24.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_24.q b/ql/src/test/queries/clientpositive/union_remove_24.q
index 055a428..3a1e225 100644
--- a/ql/src/test/queries/clientpositive/union_remove_24.q
+++ b/ql/src/test/queries/clientpositive/union_remove_24.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_25.q b/ql/src/test/queries/clientpositive/union_remove_25.q
index 33ed118..d70adb9 100644
--- a/ql/src/test/queries/clientpositive/union_remove_25.q
+++ b/ql/src/test/queries/clientpositive/union_remove_25.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_3.q b/ql/src/test/queries/clientpositive/union_remove_3.q
index 8d28277..2e6e3e6 100644
--- a/ql/src/test/queries/clientpositive/union_remove_3.q
+++ b/ql/src/test/queries/clientpositive/union_remove_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_4.q b/ql/src/test/queries/clientpositive/union_remove_4.q
index 1affbc5..a08bcc1 100644
--- a/ql/src/test/queries/clientpositive/union_remove_4.q
+++ b/ql/src/test/queries/clientpositive/union_remove_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_5.q b/ql/src/test/queries/clientpositive/union_remove_5.q
index 5769ba8..4ac3edf 100644
--- a/ql/src/test/queries/clientpositive/union_remove_5.q
+++ b/ql/src/test/queries/clientpositive/union_remove_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_6.q b/ql/src/test/queries/clientpositive/union_remove_6.q
index 5bc62d7..f37f409 100644
--- a/ql/src/test/queries/clientpositive/union_remove_6.q
+++ b/ql/src/test/queries/clientpositive/union_remove_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_6_subq.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_6_subq.q b/ql/src/test/queries/clientpositive/union_remove_6_subq.q
index 1b717c7..6853728 100644
--- a/ql/src/test/queries/clientpositive/union_remove_6_subq.q
+++ b/ql/src/test/queries/clientpositive/union_remove_6_subq.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_7.q b/ql/src/test/queries/clientpositive/union_remove_7.q
index 4e33188..cd6a75a 100644
--- a/ql/src/test/queries/clientpositive/union_remove_7.q
+++ b/ql/src/test/queries/clientpositive/union_remove_7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_8.q b/ql/src/test/queries/clientpositive/union_remove_8.q
index e809710..93aabe6 100644
--- a/ql/src/test/queries/clientpositive/union_remove_8.q
+++ b/ql/src/test/queries/clientpositive/union_remove_8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_remove_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_remove_9.q b/ql/src/test/queries/clientpositive/union_remove_9.q
index 906c2a5..1bb8d6d 100644
--- a/ql/src/test/queries/clientpositive/union_remove_9.q
+++ b/ql/src/test/queries/clientpositive/union_remove_9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.autogather=false;
 set hive.optimize.union.remove=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_script.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_script.q b/ql/src/test/queries/clientpositive/union_script.q
index df35859..7687104 100644
--- a/ql/src/test/queries/clientpositive/union_script.q
+++ b/ql/src/test/queries/clientpositive/union_script.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 select * from (
   select transform(key) using 'cat' as cola from src)s order by cola;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_top_level.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_top_level.q b/ql/src/test/queries/clientpositive/union_top_level.q
index 1101a45..d93fe38 100644
--- a/ql/src/test/queries/clientpositive/union_top_level.q
+++ b/ql/src/test/queries/clientpositive/union_top_level.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 -- top level

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_type_chk.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_type_chk.q b/ql/src/test/queries/clientpositive/union_type_chk.q
index 0c8282a..3b7b478 100644
--- a/ql/src/test/queries/clientpositive/union_type_chk.q
+++ b/ql/src/test/queries/clientpositive/union_type_chk.q
@@ -1,5 +1,7 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=false;
 set hive.execution.engine=mr;
+set hive.mapred.mode=nonstrict;
 
 select (x/sum(x) over())  as y from(select cast(1 as decimal(10,0))  as x from (select * from src limit 2)s1 union all select cast(1 as decimal(10,0)) x from (select * from src limit 2) s2 union all select '100000000' x from (select * from src limit 2) s3)u order by y;
 


[6/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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/d13b5db2/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;


[3/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_ppd_basic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_basic.q b/ql/src/test/queries/clientpositive/orc_ppd_basic.q
index f9dafef..33076d9 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_basic.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_basic.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.fetch.task.conversion=none;
 SET hive.optimize.index.filter=true;
 SET hive.cbo.enable=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_ppd_char.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_char.q b/ql/src/test/queries/clientpositive/orc_ppd_char.q
index 1f5f54a..5c34d04 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_char.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_char.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q b/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q
index e6059d3..fb1933d 100644
--- a/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q
+++ b/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE orc_pred(t tinyint,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q b/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
index 9bdad86..1760813 100644
--- a/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
+++ b/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- create table with 1000 rows
 create table srcorc(key string, value string) stored as textfile;
 insert overwrite table srcorc select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_wide_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_wide_table.q b/ql/src/test/queries/clientpositive/orc_wide_table.q
index 3d78b5a..422a3c2 100644
--- a/ql/src/test/queries/clientpositive/orc_wide_table.q
+++ b/ql/src/test/queries/clientpositive/orc_wide_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table if exists test_txt;
 drop table if exists test_orc;
 create table test_txt(

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/order2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/order2.q b/ql/src/test/queries/clientpositive/order2.q
index 6c16fe3..86617f4 100644
--- a/ql/src/test/queries/clientpositive/order2.q
+++ b/ql/src/test/queries/clientpositive/order2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/outer_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/outer_join_ppr.q b/ql/src/test/queries/clientpositive/outer_join_ppr.q
index ba8f882..497a4d1 100644
--- a/ql/src/test/queries/clientpositive/outer_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/outer_join_ppr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parallel_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parallel_join0.q b/ql/src/test/queries/clientpositive/parallel_join0.q
index b892769..69afcb1 100644
--- a/ql/src/test/queries/clientpositive/parallel_join0.q
+++ b/ql/src/test/queries/clientpositive/parallel_join0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapreduce.job.reduces=4;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parallel_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parallel_join1.q b/ql/src/test/queries/clientpositive/parallel_join1.q
index 8a58c7e..ac92efd 100644
--- a/ql/src/test/queries/clientpositive/parallel_join1.q
+++ b/ql/src/test/queries/clientpositive/parallel_join1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapreduce.job.reduces=4;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parallel_orderby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parallel_orderby.q b/ql/src/test/queries/clientpositive/parallel_orderby.q
index 73c3940..9e76ac4 100644
--- a/ql/src/test/queries/clientpositive/parallel_orderby.q
+++ b/ql/src/test/queries/clientpositive/parallel_orderby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table src5 (key string, value string);
 load data local inpath '../../data/files/kv5.txt' into table src5;
 load data local inpath '../../data/files/kv5.txt' into table src5;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parenthesis_star_by.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parenthesis_star_by.q b/ql/src/test/queries/clientpositive/parenthesis_star_by.q
index e911fbf..925bc78 100644
--- a/ql/src/test/queries/clientpositive/parenthesis_star_by.q
+++ b/ql/src/test/queries/clientpositive/parenthesis_star_by.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SELECT key, value FROM src CLUSTER BY key, value;
 SELECT key, value FROM src ORDER BY key ASC, value ASC;
 SELECT key, value FROM src SORT BY key, value;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_ctas.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_ctas.q b/ql/src/test/queries/clientpositive/parquet_ctas.q
index 652aef1..b8a3f95 100644
--- a/ql/src/test/queries/clientpositive/parquet_ctas.q
+++ b/ql/src/test/queries/clientpositive/parquet_ctas.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table staging;
 drop table parquet_ctas;
 drop table parquet_ctas_advanced;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_decimal.q b/ql/src/test/queries/clientpositive/parquet_decimal.q
index bce3ba1..1c74401 100644
--- a/ql/src/test/queries/clientpositive/parquet_decimal.q
+++ b/ql/src/test/queries/clientpositive/parquet_decimal.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS dec;
 
 CREATE TABLE dec(name string, value decimal(8,4));

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_join.q b/ql/src/test/queries/clientpositive/parquet_join.q
index 6737ff1..2a2e85b 100644
--- a/ql/src/test/queries/clientpositive/parquet_join.q
+++ b/ql/src/test/queries/clientpositive/parquet_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 drop table if exists staging;
 drop table if exists parquet_jointable1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q b/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q
index 4d7d088..fb6f458 100644
--- a/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q
+++ b/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE if exists parquet_mixed_partition_formats;
 
 CREATE TABLE parquet_mixed_partition_formats (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q b/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q
index e0b21d1..00d05d2 100644
--- a/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q
+++ b/ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add jar ${system:maven.local.repository}/org/apache/hive/hcatalog/hive-hcatalog-core/${system:hive.version}/hive-hcatalog-core-${system:hive.version}.jar;
 
 CREATE TABLE parquet_table_json_partition (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_partitioned.q b/ql/src/test/queries/clientpositive/parquet_partitioned.q
index d643fa0..4f6a1a8 100644
--- a/ql/src/test/queries/clientpositive/parquet_partitioned.q
+++ b/ql/src/test/queries/clientpositive/parquet_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q b/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q
index 3f97dec..53d84aa 100644
--- a/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q
+++ b/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.optimize.ppd=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_schema_evolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_schema_evolution.q b/ql/src/test/queries/clientpositive/parquet_schema_evolution.q
index d2f2996..193400f 100644
--- a/ql/src/test/queries/clientpositive/parquet_schema_evolution.q
+++ b/ql/src/test/queries/clientpositive/parquet_schema_evolution.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Some tables might have extra columns and struct elements on the schema than the on Parquet schema;
 -- This is called 'schema evolution' as the Parquet file is not ready yet for such new columns;
 -- Hive should support this schema, and return NULL values instead;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_serde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_serde.q b/ql/src/test/queries/clientpositive/parquet_serde.q
index 0f7d9d4..275f92a 100644
--- a/ql/src/test/queries/clientpositive/parquet_serde.q
+++ b/ql/src/test/queries/clientpositive/parquet_serde.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE if exists parquet_mixed_fileformat;
 
 CREATE TABLE parquet_mixed_fileformat (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/parquet_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_types.q b/ql/src/test/queries/clientpositive/parquet_types.q
index 99371c9..db37d2e 100644
--- a/ql/src/test/queries/clientpositive/parquet_types.q
+++ b/ql/src/test/queries/clientpositive/parquet_types.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE parquet_types_staging;
 DROP TABLE parquet_types;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partInit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partInit.q b/ql/src/test/queries/clientpositive/partInit.q
index c492b87..2b2b342 100644
--- a/ql/src/test/queries/clientpositive/partInit.q
+++ b/ql/src/test/queries/clientpositive/partInit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE empty (c INT) PARTITIONED BY (p INT);
 SELECT MAX(c) FROM empty;
 SELECT MAX(p) FROM empty;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_boolexpr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_boolexpr.q b/ql/src/test/queries/clientpositive/partition_boolexpr.q
index 3394d7d..e18f095 100644
--- a/ql/src/test/queries/clientpositive/partition_boolexpr.q
+++ b/ql/src/test/queries/clientpositive/partition_boolexpr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- create testing table.
 create table part_boolexpr(key int, value string) partitioned by (dt int, ts string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_char.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_char.q b/ql/src/test/queries/clientpositive/partition_char.q
index a42e091..ca4447b 100644
--- a/ql/src/test/queries/clientpositive/partition_char.q
+++ b/ql/src/test/queries/clientpositive/partition_char.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table partition_char_1;
 
 create table partition_char_1 (key string, value char(20)) partitioned by (dt char(10), region int);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_date.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_date.q b/ql/src/test/queries/clientpositive/partition_date.q
index 70a7b25..ffac790 100644
--- a/ql/src/test/queries/clientpositive/partition_date.q
+++ b/ql/src/test/queries/clientpositive/partition_date.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table partition_date_1;
 
 create table partition_date_1 (key string, value string) partitioned by (dt date, region string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_date2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_date2.q b/ql/src/test/queries/clientpositive/partition_date2.q
index 51ac2cd..7883db6 100644
--- a/ql/src/test/queries/clientpositive/partition_date2.q
+++ b/ql/src/test/queries/clientpositive/partition_date2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 drop table partition_date2_1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_multilevels.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_multilevels.q b/ql/src/test/queries/clientpositive/partition_multilevels.q
index bde4c62..5acc5bc 100644
--- a/ql/src/test/queries/clientpositive/partition_multilevels.q
+++ b/ql/src/test/queries/clientpositive/partition_multilevels.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table partition_test_multilevel (key string, value string) partitioned by (level1 string, level2 string, level3 string);
 
 insert overwrite table partition_test_multilevel partition(level1='1111', level2='111', level3='11') select key, value from srcpart tablesample (11 rows);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_timestamp.q b/ql/src/test/queries/clientpositive/partition_timestamp.q
index 6f290fa..c2a153d 100644
--- a/ql/src/test/queries/clientpositive/partition_timestamp.q
+++ b/ql/src/test/queries/clientpositive/partition_timestamp.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Exclude test on Windows due to space character being escaped in Hive paths on Windows.
 -- EXCLUDE_OS_WINDOWS
 drop table partition_timestamp_1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_timestamp2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_timestamp2.q b/ql/src/test/queries/clientpositive/partition_timestamp2.q
index a2c1c07..236b88e 100644
--- a/ql/src/test/queries/clientpositive/partition_timestamp2.q
+++ b/ql/src/test/queries/clientpositive/partition_timestamp2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Exclude test on Windows due to space character being escaped in Hive paths on Windows.
 -- EXCLUDE_OS_WINDOWS
 drop table partition_timestamp2_1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_type_check.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_type_check.q b/ql/src/test/queries/clientpositive/partition_type_check.q
index c9bca99..c459eec 100644
--- a/ql/src/test/queries/clientpositive/partition_type_check.q
+++ b/ql/src/test/queries/clientpositive/partition_type_check.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.typecheck.on.insert = true;
 
 -- begin part(string, string) pass(string, int)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_varchar1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_varchar1.q b/ql/src/test/queries/clientpositive/partition_varchar1.q
index 22aadd3..dd991fd 100644
--- a/ql/src/test/queries/clientpositive/partition_varchar1.q
+++ b/ql/src/test/queries/clientpositive/partition_varchar1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table partition_varchar_1;
 
 create table partition_varchar_1 (key string, value varchar(20)) partitioned by (dt varchar(10), region int);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_vs_table_metadata.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_vs_table_metadata.q b/ql/src/test/queries/clientpositive/partition_vs_table_metadata.q
index 9f493e5..dbb6393 100644
--- a/ql/src/test/queries/clientpositive/partition_vs_table_metadata.q
+++ b/ql/src/test/queries/clientpositive/partition_vs_table_metadata.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 create table partition_vs_table(key string, value string) partitioned by (ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_wise_fileformat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_wise_fileformat.q b/ql/src/test/queries/clientpositive/partition_wise_fileformat.q
index f0d58cf..7b2f48d 100644
--- a/ql/src/test/queries/clientpositive/partition_wise_fileformat.q
+++ b/ql/src/test/queries/clientpositive/partition_wise_fileformat.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 create table partition_test_partitioned(key string, value string) partitioned by (dt string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_wise_fileformat13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_wise_fileformat13.q b/ql/src/test/queries/clientpositive/partition_wise_fileformat13.q
index f124ec3..645d53a 100644
--- a/ql/src/test/queries/clientpositive/partition_wise_fileformat13.q
+++ b/ql/src/test/queries/clientpositive/partition_wise_fileformat13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.input.format = org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
 
 -- This tests that the schema can be changed for partitioned tables for binary serde data for joins
@@ -6,7 +7,7 @@ alter table T1 set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColum
 insert overwrite table T1 partition (dt='1') select * from src where key = 238 or key = 97;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table T1 change key key int;
-reset hive.metastore.disallow.incompatible.col.type.changes;
+
 insert overwrite table T1 partition (dt='2') select * from src where key = 238 or key = 97;
 
 alter table T1 change key key string;
@@ -16,3 +17,4 @@ insert overwrite table T2 partition (dt='1') select * from src where key = 238 o
 
 select /* + MAPJOIN(a) */ count(*) FROM T1 a JOIN T2 b ON a.key = b.key;
 select count(*) FROM T1 a JOIN T2 b ON a.key = b.key;
+reset hive.metastore.disallow.incompatible.col.type.changes;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_wise_fileformat14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_wise_fileformat14.q b/ql/src/test/queries/clientpositive/partition_wise_fileformat14.q
index 886f906..dba4f30 100644
--- a/ql/src/test/queries/clientpositive/partition_wise_fileformat14.q
+++ b/ql/src/test/queries/clientpositive/partition_wise_fileformat14.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 1;
 
 CREATE TABLE tbl1(key int, value string) PARTITIONED by (ds string)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q b/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q
index f769abb..71bdfa4 100644
--- a/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q
+++ b/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- HIVE-5199, HIVE-5285 : CustomSerDe(1, 2, 3) are used here.
 -- The final results should be all NULL columns deserialized using 
 -- CustomSerDe(1, 2, 3) irrespective of the inserted values

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q b/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q
index e9aef8a..113c54f 100644
--- a/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q
+++ b/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- HIVE-5202 : Tests for SettableUnionObjectInspectors
 -- CustomSerDe(4,5) are used here. 
 -- The final results should be all NULL columns deserialized using 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/partition_wise_fileformat2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/partition_wise_fileformat2.q b/ql/src/test/queries/clientpositive/partition_wise_fileformat2.q
index de51cdd..b8dddc9 100644
--- a/ql/src/test/queries/clientpositive/partition_wise_fileformat2.q
+++ b/ql/src/test/queries/clientpositive/partition_wise_fileformat2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_BEFORE_DIFF
 
 create table partition_test_partitioned(key string, value string) partitioned by (dt string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/pcr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/pcr.q b/ql/src/test/queries/clientpositive/pcr.q
index a2ffda3..bfa29a5 100644
--- a/ql/src/test/queries/clientpositive/pcr.q
+++ b/ql/src/test/queries/clientpositive/pcr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table pcr_t1;
 drop table pcr_t2;
 drop table pcr_t3;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/pcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/pcs.q b/ql/src/test/queries/clientpositive/pcs.q
index 4b35a4d..0667e95 100644
--- a/ql/src/test/queries/clientpositive/pcs.q
+++ b/ql/src/test/queries/clientpositive/pcs.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table pcs_t1; 
 drop table pcs_t2; 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/pointlookup2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/pointlookup2.q b/ql/src/test/queries/clientpositive/pointlookup2.q
index 94e99fb..5891228 100644
--- a/ql/src/test/queries/clientpositive/pointlookup2.q
+++ b/ql/src/test/queries/clientpositive/pointlookup2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table pcr_t1;
 drop table pcr_t2;
 drop table pcr_t3;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/pointlookup3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/pointlookup3.q b/ql/src/test/queries/clientpositive/pointlookup3.q
index 79e7348..e24bae1 100644
--- a/ql/src/test/queries/clientpositive/pointlookup3.q
+++ b/ql/src/test/queries/clientpositive/pointlookup3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table pcr_t1;
 
 create table pcr_t1 (key int, value string) partitioned by (ds1 string, ds2 string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/pointlookup4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/pointlookup4.q b/ql/src/test/queries/clientpositive/pointlookup4.q
index e0bf5a6..5832573 100644
--- a/ql/src/test/queries/clientpositive/pointlookup4.q
+++ b/ql/src/test/queries/clientpositive/pointlookup4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table pcr_t1;
 
 create table pcr_t1 (key int, value string) partitioned by (ds1 string, ds2 string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd2.q b/ql/src/test/queries/clientpositive/ppd2.q
index 536eb98..b955652 100644
--- a/ql/src/test/queries/clientpositive/ppd2.q
+++ b/ql/src/test/queries/clientpositive/ppd2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_constant_expr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_constant_expr.q b/ql/src/test/queries/clientpositive/ppd_constant_expr.q
index 969c7e4..14518e8 100644
--- a/ql/src/test/queries/clientpositive/ppd_constant_expr.q
+++ b/ql/src/test/queries/clientpositive/ppd_constant_expr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_gby.q b/ql/src/test/queries/clientpositive/ppd_gby.q
index 65c0b01..e027544 100644
--- a/ql/src/test/queries/clientpositive/ppd_gby.q
+++ b/ql/src/test/queries/clientpositive/ppd_gby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_gby2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_gby2.q b/ql/src/test/queries/clientpositive/ppd_gby2.q
index ae288ea..689a0d3 100644
--- a/ql/src/test/queries/clientpositive/ppd_gby2.q
+++ b/ql/src/test/queries/clientpositive/ppd_gby2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_gby_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_gby_join.q b/ql/src/test/queries/clientpositive/ppd_gby_join.q
index 96f7f8f..e074ae4 100644
--- a/ql/src/test/queries/clientpositive/ppd_gby_join.q
+++ b/ql/src/test/queries/clientpositive/ppd_gby_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_join.q b/ql/src/test/queries/clientpositive/ppd_join.q
index 1a2a198..8e68518 100644
--- a/ql/src/test/queries/clientpositive/ppd_join.q
+++ b/ql/src/test/queries/clientpositive/ppd_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_join2.q b/ql/src/test/queries/clientpositive/ppd_join2.q
index de8db73..1aee943 100644
--- a/ql/src/test/queries/clientpositive/ppd_join2.q
+++ b/ql/src/test/queries/clientpositive/ppd_join2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_join3.q b/ql/src/test/queries/clientpositive/ppd_join3.q
index e2ffddf..d7bd4db 100644
--- a/ql/src/test/queries/clientpositive/ppd_join3.q
+++ b/ql/src/test/queries/clientpositive/ppd_join3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_join5.q b/ql/src/test/queries/clientpositive/ppd_join5.q
index e1675d3..f637155 100644
--- a/ql/src/test/queries/clientpositive/ppd_join5.q
+++ b/ql/src/test/queries/clientpositive/ppd_join5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table t1 (id1 string, id2 string);
 create table t2 (id string, d int);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_join_filter.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_join_filter.q b/ql/src/test/queries/clientpositive/ppd_join_filter.q
index 9d42ef2..418f4c5 100644
--- a/ql/src/test/queries/clientpositive/ppd_join_filter.q
+++ b/ql/src/test/queries/clientpositive/ppd_join_filter.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_multi_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_multi_insert.q b/ql/src/test/queries/clientpositive/ppd_multi_insert.q
index 45f8c1f..775cefc 100644
--- a/ql/src/test/queries/clientpositive/ppd_multi_insert.q
+++ b/ql/src/test/queries/clientpositive/ppd_multi_insert.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_outer_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_outer_join1.q b/ql/src/test/queries/clientpositive/ppd_outer_join1.q
index cd992b3..30f5b84 100644
--- a/ql/src/test/queries/clientpositive/ppd_outer_join1.q
+++ b/ql/src/test/queries/clientpositive/ppd_outer_join1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_outer_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_outer_join2.q b/ql/src/test/queries/clientpositive/ppd_outer_join2.q
index ad96afa..b7c8833 100644
--- a/ql/src/test/queries/clientpositive/ppd_outer_join2.q
+++ b/ql/src/test/queries/clientpositive/ppd_outer_join2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_outer_join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_outer_join3.q b/ql/src/test/queries/clientpositive/ppd_outer_join3.q
index 03169a4..930803c 100644
--- a/ql/src/test/queries/clientpositive/ppd_outer_join3.q
+++ b/ql/src/test/queries/clientpositive/ppd_outer_join3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_outer_join4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_outer_join4.q b/ql/src/test/queries/clientpositive/ppd_outer_join4.q
index 77f3be1..e3aaa0e 100644
--- a/ql/src/test/queries/clientpositive/ppd_outer_join4.q
+++ b/ql/src/test/queries/clientpositive/ppd_outer_join4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_outer_join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_outer_join5.q b/ql/src/test/queries/clientpositive/ppd_outer_join5.q
index 382b949..cdd7db5 100644
--- a/ql/src/test/queries/clientpositive/ppd_outer_join5.q
+++ b/ql/src/test/queries/clientpositive/ppd_outer_join5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_random.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_random.q b/ql/src/test/queries/clientpositive/ppd_random.q
index de0c067..341f5f1 100644
--- a/ql/src/test/queries/clientpositive/ppd_random.q
+++ b/ql/src/test/queries/clientpositive/ppd_random.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_repeated_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_repeated_alias.q b/ql/src/test/queries/clientpositive/ppd_repeated_alias.q
index 732671a..cb9039e 100644
--- a/ql/src/test/queries/clientpositive/ppd_repeated_alias.q
+++ b/ql/src/test/queries/clientpositive/ppd_repeated_alias.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table pokes;
 drop table pokes2;
 create table pokes (foo int, bar int, blah int);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_udf_case.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_udf_case.q b/ql/src/test/queries/clientpositive/ppd_udf_case.q
index b7a6b15..2aad141 100644
--- a/ql/src/test/queries/clientpositive/ppd_udf_case.q
+++ b/ql/src/test/queries/clientpositive/ppd_udf_case.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_udf_col.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_udf_col.q b/ql/src/test/queries/clientpositive/ppd_udf_col.q
index 993da97..451edd5 100644
--- a/ql/src/test/queries/clientpositive/ppd_udf_col.q
+++ b/ql/src/test/queries/clientpositive/ppd_udf_col.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_union.q b/ql/src/test/queries/clientpositive/ppd_union.q
index 2cd876e..ca1ff40 100644
--- a/ql/src/test/queries/clientpositive/ppd_union.q
+++ b/ql/src/test/queries/clientpositive/ppd_union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_union_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_union_view.q b/ql/src/test/queries/clientpositive/ppd_union_view.q
index a7606c5..08b4fce 100644
--- a/ql/src/test/queries/clientpositive/ppd_union_view.q
+++ b/ql/src/test/queries/clientpositive/ppd_union_view.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- test predicate pushdown on a view with a union
 
 drop view v;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppd_vc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_vc.q b/ql/src/test/queries/clientpositive/ppd_vc.q
index b5efdb3..0bb949d 100644
--- a/ql/src/test/queries/clientpositive/ppd_vc.q
+++ b/ql/src/test/queries/clientpositive/ppd_vc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 --HIVE-3926 PPD on virtual column of partitioned table is not working
 
 explain extended

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppr_allchildsarenull.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppr_allchildsarenull.q b/ql/src/test/queries/clientpositive/ppr_allchildsarenull.q
index 3cda01b..6146073 100644
--- a/ql/src/test/queries/clientpositive/ppr_allchildsarenull.q
+++ b/ql/src/test/queries/clientpositive/ppr_allchildsarenull.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 
 EXPLAIN EXTENDED

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ppr_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppr_pushdown.q b/ql/src/test/queries/clientpositive/ppr_pushdown.q
index 440005f..a3e6d6e 100644
--- a/ql/src/test/queries/clientpositive/ppr_pushdown.q
+++ b/ql/src/test/queries/clientpositive/ppr_pushdown.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 
 create table ppr_test (key string) partitioned by (ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/print_header.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/print_header.q b/ql/src/test/queries/clientpositive/print_header.q
index 3ca0340..9deeb1d 100644
--- a/ql/src/test/queries/clientpositive/print_header.q
+++ b/ql/src/test/queries/clientpositive/print_header.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.cli.print.header=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ptfgroupbyjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ptfgroupbyjoin.q b/ql/src/test/queries/clientpositive/ptfgroupbyjoin.q
index 61d034e..62472c8 100644
--- a/ql/src/test/queries/clientpositive/ptfgroupbyjoin.q
+++ b/ql/src/test/queries/clientpositive/ptfgroupbyjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table tlb1 (id int, fkey int, val string);
 create table tlb2 (fid int, name string);
 insert into table tlb1 values(100,1,'abc');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/push_or.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/push_or.q b/ql/src/test/queries/clientpositive/push_or.q
index c9b6cea..c962452 100644
--- a/ql/src/test/queries/clientpositive/push_or.q
+++ b/ql/src/test/queries/clientpositive/push_or.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table push_or;
 
 create table push_or (key int, value string) partitioned by (ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/quote1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/quote1.q b/ql/src/test/queries/clientpositive/quote1.q
index f968132..e46402c 100644
--- a/ql/src/test/queries/clientpositive/quote1.q
+++ b/ql/src/test/queries/clientpositive/quote1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(`location` INT, `type` STRING) PARTITIONED BY(`table` STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/quotedid_basic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/quotedid_basic.q b/ql/src/test/queries/clientpositive/quotedid_basic.q
index 680868e..a16f6f5 100644
--- a/ql/src/test/queries/clientpositive/quotedid_basic.q
+++ b/ql/src/test/queries/clientpositive/quotedid_basic.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.support.quoted.identifiers=column;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/quotedid_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/quotedid_partition.q b/ql/src/test/queries/clientpositive/quotedid_partition.q
index e9416ae..67eca10 100644
--- a/ql/src/test/queries/clientpositive/quotedid_partition.q
+++ b/ql/src/test/queries/clientpositive/quotedid_partition.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.support.quoted.identifiers=column;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/quotedid_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/quotedid_skew.q b/ql/src/test/queries/clientpositive/quotedid_skew.q
index 5634ff2..94a2f92 100644
--- a/ql/src/test/queries/clientpositive/quotedid_skew.q
+++ b/ql/src/test/queries/clientpositive/quotedid_skew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.support.quoted.identifiers=column;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rand_partitionpruner3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rand_partitionpruner3.q b/ql/src/test/queries/clientpositive/rand_partitionpruner3.q
index 9f4aaac..481ba08 100644
--- a/ql/src/test/queries/clientpositive/rand_partitionpruner3.q
+++ b/ql/src/test/queries/clientpositive/rand_partitionpruner3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 -- complex predicates in the where clause
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_columnar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_columnar.q b/ql/src/test/queries/clientpositive/rcfile_columnar.q
index 0178e53..5fd94e7 100644
--- a/ql/src/test/queries/clientpositive/rcfile_columnar.q
+++ b/ql/src/test/queries/clientpositive/rcfile_columnar.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 CREATE table columnTable (key STRING, value STRING)
 ROW FORMAT SERDE

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_createas1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_createas1.q b/ql/src/test/queries/clientpositive/rcfile_createas1.q
index f362037..200c0ec 100644
--- a/ql/src/test/queries/clientpositive/rcfile_createas1.q
+++ b/ql/src/test/queries/clientpositive/rcfile_createas1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.merge.rcfile.block.level=true;
 set mapred.max.split.size=100;
 set mapred.min.split.size=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_lazydecompress.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_lazydecompress.q b/ql/src/test/queries/clientpositive/rcfile_lazydecompress.q
index 7f55d10..a6d39c4 100644
--- a/ql/src/test/queries/clientpositive/rcfile_lazydecompress.q
+++ b/ql/src/test/queries/clientpositive/rcfile_lazydecompress.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 CREATE table rcfileTableLazyDecompress (key STRING, value STRING) STORED AS RCFile;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_merge2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_merge2.q b/ql/src/test/queries/clientpositive/rcfile_merge2.q
index 215d5eb..f5b7add 100644
--- a/ql/src/test/queries/clientpositive/rcfile_merge2.q
+++ b/ql/src/test/queries/clientpositive/rcfile_merge2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.merge.rcfile.block.level=true;
 set hive.exec.dynamic.partition=true;
 set mapred.max.split.size=100;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_merge3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_merge3.q b/ql/src/test/queries/clientpositive/rcfile_merge3.q
index 39fbd25..25d115c 100644
--- a/ql/src/test/queries/clientpositive/rcfile_merge3.q
+++ b/ql/src/test/queries/clientpositive/rcfile_merge3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.merge.rcfile.block.level=true;
 set mapred.max.split.size=100;
 set mapred.min.split.size=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_merge4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_merge4.q b/ql/src/test/queries/clientpositive/rcfile_merge4.q
index fe6df28..cf18f80 100644
--- a/ql/src/test/queries/clientpositive/rcfile_merge4.q
+++ b/ql/src/test/queries/clientpositive/rcfile_merge4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.merge.rcfile.block.level=true;
 set mapred.max.split.size=100;
 set mapred.min.split.size=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_null_value.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_null_value.q b/ql/src/test/queries/clientpositive/rcfile_null_value.q
index 2e4c929..5ef80a7 100644
--- a/ql/src/test/queries/clientpositive/rcfile_null_value.q
+++ b/ql/src/test/queries/clientpositive/rcfile_null_value.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE src1_rc(key STRING, value STRING) STORED AS RCFILE;
 INSERT OVERWRITE TABLE src1_rc SELECT * FROM src1;
 SELECT * FROM src1_rc;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_toleratecorruptions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_toleratecorruptions.q b/ql/src/test/queries/clientpositive/rcfile_toleratecorruptions.q
index 077a52d..cd3267f 100644
--- a/ql/src/test/queries/clientpositive/rcfile_toleratecorruptions.q
+++ b/ql/src/test/queries/clientpositive/rcfile_toleratecorruptions.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE test_src(key int, value string) stored as RCFILE;
 set hive.io.rcfile.record.interval=5;
 set hive.io.rcfile.record.buffer.size=100;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rcfile_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rcfile_union.q b/ql/src/test/queries/clientpositive/rcfile_union.q
index fc8c750..8308acc 100644
--- a/ql/src/test/queries/clientpositive/rcfile_union.q
+++ b/ql/src/test/queries/clientpositive/rcfile_union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 CREATE table rcfile_unionTable (b STRING, c STRING)
 ROW FORMAT SERDE

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q b/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q
index 3d7df11..798dddc 100644
--- a/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q
+++ b/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.reducededuplication=true;
 set hive.optimize.reducededuplication.min.reducer=1;
 set hive.map.aggr=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/regex_col.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/regex_col.q b/ql/src/test/queries/clientpositive/regex_col.q
index 1c311fc..774cb62 100644
--- a/ql/src/test/queries/clientpositive/regex_col.q
+++ b/ql/src/test/queries/clientpositive/regex_col.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.support.quoted.identifiers=none;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/remote_script.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/remote_script.q b/ql/src/test/queries/clientpositive/remote_script.q
index c4fcaaf..ba0d00f 100644
--- a/ql/src/test/queries/clientpositive/remote_script.q
+++ b/ql/src/test/queries/clientpositive/remote_script.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 dfs -put ../../data/scripts/newline.py /newline.py;
 add file hdfs:///newline.py;
 set hive.transform.escape.input=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/rename_external_partition_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rename_external_partition_location.q b/ql/src/test/queries/clientpositive/rename_external_partition_location.q
index faebd55..be93bd4 100644
--- a/ql/src/test/queries/clientpositive/rename_external_partition_location.q
+++ b/ql/src/test/queries/clientpositive/rename_external_partition_location.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/ex_table;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/repl_2_exim_basic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/repl_2_exim_basic.q b/ql/src/test/queries/clientpositive/repl_2_exim_basic.q
index 893d468..0a2a53d 100644
--- a/ql/src/test/queries/clientpositive/repl_2_exim_basic.q
+++ b/ql/src/test/queries/clientpositive/repl_2_exim_basic.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=managed_t,ext_t,managed_t_imported,managed_t_r_imported,ext_t_imported,ext_t_r_imported;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/repl_3_exim_metadata.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/repl_3_exim_metadata.q b/ql/src/test/queries/clientpositive/repl_3_exim_metadata.q
index 6d24d39..08130b6 100644
--- a/ql/src/test/queries/clientpositive/repl_3_exim_metadata.q
+++ b/ql/src/test/queries/clientpositive/repl_3_exim_metadata.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=replsrc,repldst,repldst_md;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/root_dir_external_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/root_dir_external_table.q b/ql/src/test/queries/clientpositive/root_dir_external_table.q
index a0514c8..a242ca7 100644
--- a/ql/src/test/queries/clientpositive/root_dir_external_table.q
+++ b/ql/src/test/queries/clientpositive/root_dir_external_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_root_dir_external_table;
 
 insert overwrite directory "hdfs:///tmp/test_root_dir_external_table" select key from src where (key < 20) order by key;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/router_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/router_join_ppr.q b/ql/src/test/queries/clientpositive/router_join_ppr.q
index f604f0e..d659944 100644
--- a/ql/src/test/queries/clientpositive/router_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/router_join_ppr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q b/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q
index 1888005..2d12d08 100644
--- a/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q
+++ b/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin = true;
 set hive.skewjoin.key = 4;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/sample10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample10.q b/ql/src/test/queries/clientpositive/sample10.q
index 3aec841..b410644 100644
--- a/ql/src/test/queries/clientpositive/sample10.q
+++ b/ql/src/test/queries/clientpositive/sample10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.submitviachild=true;
 set hive.exec.submit.local.task.via.child=true;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/sample6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample6.q b/ql/src/test/queries/clientpositive/sample6.q
index ea3511f..8f9a463 100644
--- a/ql/src/test/queries/clientpositive/sample6.q
+++ b/ql/src/test/queries/clientpositive/sample6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 
 -- both input pruning and sample filter

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/sample8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample8.q b/ql/src/test/queries/clientpositive/sample8.q
index 1176aa4..d53d510 100644
--- a/ql/src/test/queries/clientpositive/sample8.q
+++ b/ql/src/test/queries/clientpositive/sample8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- sampling with join and alias
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q b/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q
index 5bcb344..3f986e0 100644
--- a/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q
+++ b/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.submitviachild=true;
 set hive.exec.submit.local.task.via.child=true;
 set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q
index d6919c1..6fe9d45 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;
 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/d13b5db2/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q
index a8770fc..1581192 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;
 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/d13b5db2/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q
index 06dc5f8..be3e4da 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;
 SET hive.vectorized.execution.enabled=false;
 set hive.fetch.task.conversion=more;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
index 8b413cc..d1b0d97 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;
 SET hive.vectorized.execution.enabled=false;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q
index f56668f..676756d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=more;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q
index cd00afe..eaa3dc3 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;
 SET hive.vectorized.execution.enabled=false;
 set hive.fetch.task.conversion=more;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
index 5d0318d..aa2cd5e 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;
 SET hive.vectorized.execution.enabled=false;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/schemeAuthority.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schemeAuthority.q b/ql/src/test/queries/clientpositive/schemeAuthority.q
index c0e18c5..6f545b1 100644
--- a/ql/src/test/queries/clientpositive/schemeAuthority.q
+++ b/ql/src/test/queries/clientpositive/schemeAuthority.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} file:///tmp/test;
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/test;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/schemeAuthority2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schemeAuthority2.q b/ql/src/test/queries/clientpositive/schemeAuthority2.q
index b3c38bf..7f87909 100644
--- a/ql/src/test/queries/clientpositive/schemeAuthority2.q
+++ b/ql/src/test/queries/clientpositive/schemeAuthority2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} file:///tmp/test;
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/test;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/selectDistinctStar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/selectDistinctStar.q b/ql/src/test/queries/clientpositive/selectDistinctStar.q
index cee83bb..3168531 100644
--- a/ql/src/test/queries/clientpositive/selectDistinctStar.q
+++ b/ql/src/test/queries/clientpositive/selectDistinctStar.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/d13b5db2/ql/src/test/queries/clientpositive/select_same_col.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_same_col.q b/ql/src/test/queries/clientpositive/select_same_col.q
index 21f0d45..96bed1a 100644
--- a/ql/src/test/queries/clientpositive/select_same_col.q
+++ b/ql/src/test/queries/clientpositive/select_same_col.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/select_unquote_and.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_unquote_and.q b/ql/src/test/queries/clientpositive/select_unquote_and.q
index 275c774..529cbc3 100644
--- a/ql/src/test/queries/clientpositive/select_unquote_and.q
+++ b/ql/src/test/queries/clientpositive/select_unquote_and.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
 
 INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-11')

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/select_unquote_not.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_unquote_not.q b/ql/src/test/queries/clientpositive/select_unquote_not.q
index 93d992e..b5f3a67 100644
--- a/ql/src/test/queries/clientpositive/select_unquote_not.q
+++ b/ql/src/test/queries/clientpositive/select_unquote_not.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
 
 INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-11')

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/select_unquote_or.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_unquote_or.q b/ql/src/test/queries/clientpositive/select_unquote_or.q
index 5dd0776..79ef863 100644
--- a/ql/src/test/queries/clientpositive/select_unquote_or.q
+++ b/ql/src/test/queries/clientpositive/select_unquote_or.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
 
 INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-11')

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/semijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin.q b/ql/src/test/queries/clientpositive/semijoin.q
index 29190c4..c41d222 100644
--- a/ql/src/test/queries/clientpositive/semijoin.q
+++ b/ql/src/test/queries/clientpositive/semijoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 create table t1 as select cast(key as int) key, value from src where key <= 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/serde_regex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/serde_regex.q b/ql/src/test/queries/clientpositive/serde_regex.q
index 91cc147..e21c6e1 100644
--- a/ql/src/test/queries/clientpositive/serde_regex.q
+++ b/ql/src/test/queries/clientpositive/serde_regex.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 CREATE TABLE serde_regex(
   host STRING,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/set_processor_namespaces.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/set_processor_namespaces.q b/ql/src/test/queries/clientpositive/set_processor_namespaces.q
index d10239c..612807f 100644
--- a/ql/src/test/queries/clientpositive/set_processor_namespaces.q
+++ b/ql/src/test/queries/clientpositive/set_processor_namespaces.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set zzz=5;
 set zzz;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin.q b/ql/src/test/queries/clientpositive/skewjoin.q
index 5c8b326..52b8639 100644
--- a/ql/src/test/queries/clientpositive/skewjoin.q
+++ b/ql/src/test/queries/clientpositive/skewjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.optimize.skewjoin = true;
 set hive.skewjoin.key = 2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q
index f768919..70feb9d 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q
index 3ebf459..abfde79 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q
index b1ad7a4..34b06d8 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q
index 278986d..f4f4489 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q
index 5ea4650..280b8a5 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q
index ac4cc2f..c9aa9e6 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q
index 63ef6e8..1c49b5f 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q
index d06652f..2f263bf 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q
index 4336a39..78dcc90 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
     

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q
index 8ca9c87..34a8f54 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q b/ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q
index 6ba2424..c612974 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 set hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_noskew.q b/ql/src/test/queries/clientpositive/skewjoin_noskew.q
index b8ca592..228373c 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_noskew.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_noskew.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.skewjoin=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_onesideskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_onesideskew.q b/ql/src/test/queries/clientpositive/skewjoin_onesideskew.q
index 371f05c..6d6b9cc 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_onesideskew.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_onesideskew.q
@@ -1,7 +1,7 @@
 set hive.auto.convert.join=false;
 set hive.optimize.skewjoin=true;
 set hive.skewjoin.key=2;
-
+set hive.mapred.mode=nonstrict;
 
 DROP TABLE IF EXISTS skewtable;
 CREATE TABLE skewtable (key STRING, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q b/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q
index 9b0dec5..5e688d7 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 set hive.stats.autogather=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q b/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q
index 26db5e1..3e2610f 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 set hive.stats.autogather=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt1.q b/ql/src/test/queries/clientpositive/skewjoinopt1.q
index 8a4a03e..e32a583 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt1.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt10.q b/ql/src/test/queries/clientpositive/skewjoinopt10.q
index f6ccc9b..16de44c 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt10.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt11.q b/ql/src/test/queries/clientpositive/skewjoinopt11.q
index 88a55c5..880e8f1 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt11.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
     
 CREATE TABLE T1(key STRING, val STRING)	

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt12.q b/ql/src/test/queries/clientpositive/skewjoinopt12.q
index ad01cef..3d7b170 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt12.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt13.q b/ql/src/test/queries/clientpositive/skewjoinopt13.q
index 92b1ab7..36ad3c6 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt13.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt14.q b/ql/src/test/queries/clientpositive/skewjoinopt14.q
index 5f223e6..94dab19 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt14.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt15.q b/ql/src/test/queries/clientpositive/skewjoinopt15.q
index 9fb928f..ba86256 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt15.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt15.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt16.q b/ql/src/test/queries/clientpositive/skewjoinopt16.q
index 0d5a31f..1345334 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt16.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt16.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt17.q b/ql/src/test/queries/clientpositive/skewjoinopt17.q
index 2e55903..1c866a5 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt17.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt18.q b/ql/src/test/queries/clientpositive/skewjoinopt18.q
index ac2643c..a2a2618 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt18.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt18.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt19.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt19.q b/ql/src/test/queries/clientpositive/skewjoinopt19.q
index 5317ee0..1eb990f 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt19.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt19.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt2.q b/ql/src/test/queries/clientpositive/skewjoinopt2.q
index 099e2b8..7cca946 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt2.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt20.q b/ql/src/test/queries/clientpositive/skewjoinopt20.q
index c798213..3b95fc5 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt20.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt20.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt21.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt21.q b/ql/src/test/queries/clientpositive/skewjoinopt21.q
index 76dde57..7ff086d 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt21.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt21.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt3.q b/ql/src/test/queries/clientpositive/skewjoinopt3.q
index e4812a6..35cc41a 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt3.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)


[7/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestClientSideAuthorizationProvider.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestClientSideAuthorizationProvider.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestClientSideAuthorizationProvider.java
index 9040b1c..2e2da99 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestClientSideAuthorizationProvider.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestClientSideAuthorizationProvider.java
@@ -75,7 +75,7 @@ public class TestClientSideAuthorizationProvider extends TestCase {
     clientHiveConf.set(HiveConf.ConfVars.HIVE_AUTHENTICATOR_MANAGER.varname,
         InjectableDummyAuthenticator.class.getName());
     clientHiveConf.set(HiveConf.ConfVars.HIVE_AUTHORIZATION_TABLE_OWNER_GRANTS.varname, "");
-
+    clientHiveConf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     clientHiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:" + port);
     clientHiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3);
     clientHiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestFolderPermissions.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestFolderPermissions.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestFolderPermissions.java
index 5ba9e56..6cc2d18 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestFolderPermissions.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestFolderPermissions.java
@@ -30,6 +30,7 @@ public class TestFolderPermissions extends FolderPermissionBase {
   @BeforeClass
   public static void setup() throws Exception {
     conf = new HiveConf(TestFolderPermissions.class);
+    conf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     baseSetup();
   }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java
index 4b48e7e..9f47f84 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java
@@ -91,6 +91,7 @@ public class TestHiveAuthorizerCheckInvocation {
     conf.setBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS, false);
     conf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, true);
     conf.setVar(ConfVars.HIVE_TXN_MANAGER, DbTxnManager.class.getName());
+    conf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
 
     SessionState.start(conf);
     driver = new Driver(conf);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
index 34bce1e..813b107 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
@@ -110,6 +110,7 @@ public class TestCompactor {
     hiveConf.setVar(HiveConf.ConfVars.METASTOREWAREHOUSE, TEST_WAREHOUSE_DIR);
     hiveConf.setVar(HiveConf.ConfVars.HIVEINPUTFORMAT, HiveInputFormat.class.getName());
     hiveConf.setVar(HiveConf.ConfVars.DYNAMICPARTITIONINGMODE, "nonstrict");
+    hiveConf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     //"org.apache.hadoop.hive.ql.io.HiveInputFormat"
 
     TxnDbUtil.setConfValues(hiveConf);
@@ -343,7 +344,7 @@ public class TestCompactor {
    * 5. Trigger major compaction (which should update stats)
    * 6. check that stats have been updated
    * @throws Exception
-   * todo: 
+   * todo:
    * 2. add non-partitioned test
    * 4. add a test with sorted table?
    */
@@ -391,7 +392,7 @@ public class TestCompactor {
     su = Worker.StatsUpdater.init(ciPart2, colNames, conf, System.getProperty("user.name"));
     su.gatherStats();//compute stats before compaction
     LOG.debug("List of stats columns after analyze Part2: " + txnHandler.findColumnsWithStats(ci));
-    
+
     //now make sure we get the stats we expect for partition we are going to add data to later
     Map<String, List<ColumnStatisticsObj>> stats = msClient.getPartitionColumnStatistics(ci.dbname,
       ci.tableName, Arrays.asList(ci.partName), colNames);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
index 65016b7..8cb9689 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
@@ -131,6 +131,7 @@ public class TestJdbcDriver2 {
     Class.forName(driverName);
     Connection con1 = getConnection("default");
     System.setProperty(ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LEVEL.varname, "verbose");
+    System.setProperty(ConfVars.HIVEMAPREDMODE.varname, "nonstrict");
 
     Statement stmt1 = con1.createStatement();
     assertNotNull("Statement is null", stmt1);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/itests/hive-unit/src/test/java/org/apache/hive/service/cli/TestEmbeddedThriftBinaryCLIService.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/TestEmbeddedThriftBinaryCLIService.java b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/TestEmbeddedThriftBinaryCLIService.java
index e7be18a..de66d9e 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/TestEmbeddedThriftBinaryCLIService.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/TestEmbeddedThriftBinaryCLIService.java
@@ -36,7 +36,9 @@ public class TestEmbeddedThriftBinaryCLIService extends CLIServiceTest {
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
     service = new EmbeddedThriftBinaryCLIService();
-    service.init(new HiveConf());
+    HiveConf conf = new HiveConf();
+    conf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
+    service.init(conf);
     client = new ThriftCLIServiceClient(service);
   }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java
index 54da909..68190c2 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java
@@ -86,6 +86,7 @@ public class TestTxnCommands {
     hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
     hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
     hiveConf.set(HiveConf.ConfVars.METASTOREWAREHOUSE.varname, TEST_WAREHOUSE_DIR);
+    hiveConf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     TxnDbUtil.setConfValues(hiveConf);
     TxnDbUtil.prepDb();
     File f = new File(TEST_WAREHOUSE_DIR);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
index 8616eb0..5840949 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
@@ -81,6 +81,7 @@ public class TestTxnCommands2 {
     hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
     hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
     hiveConf.set(HiveConf.ConfVars.METASTOREWAREHOUSE.varname, TEST_WAREHOUSE_DIR);
+    hiveConf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     TxnDbUtil.setConfValues(hiveConf);
     TxnDbUtil.prepDb();
     File f = new File(TEST_WAREHOUSE_DIR);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
index e18117a..000b46b 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
@@ -397,6 +397,7 @@ public class TestOperators extends TestCase {
   public void testFetchOperatorContext() throws Exception {
     HiveConf conf = new HiveConf();
     conf.set("hive.support.concurrency", "false");
+    conf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     SessionState.start(conf);
     String cmd = "create table fetchOp (id int, name string) " +
         "partitioned by (state string) " +

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java
index f0f014c..2b33da1 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java
@@ -223,6 +223,7 @@ public class TestUpdateDeleteSemanticAnalyzer {
   public void setup() {
     conf = new HiveConf();
     conf.setVar(HiveConf.ConfVars.DYNAMICPARTITIONINGMODE, "nonstrict");
+    conf.setVar(HiveConf.ConfVars.HIVEMAPREDMODE, "nonstrict");
     conf.setVar(HiveConf.ConfVars.HIVE_TXN_MANAGER, "org.apache.hadoop.hive.ql.lockmgr.DbTxnManager");
   }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientcompare/llap_0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientcompare/llap_0.q b/ql/src/test/queries/clientcompare/llap_0.q
index 0a95282..27dc1c1 100644
--- a/ql/src/test/queries/clientcompare/llap_0.q
+++ b/ql/src/test/queries/clientcompare/llap_0.q
@@ -1,5 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
-
+set hive.mapred.mode=nonstrict;
 SELECT   cfloat,
          cint,
          cdouble,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/authorization_uri_import.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/authorization_uri_import.q b/ql/src/test/queries/clientnegative/authorization_uri_import.q
index a6733b5..58ca093 100644
--- a/ql/src/test/queries/clientnegative/authorization_uri_import.q
+++ b/ql/src/test/queries/clientnegative/authorization_uri_import.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.authz.sstd.hs2.mode=true;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q b/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q
index 6bebb89..7dce81f 100644
--- a/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q
+++ b/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.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 3 BUCKETS
   STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/ctasnullcol.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ctasnullcol.q b/ql/src/test/queries/clientnegative/ctasnullcol.q
index b03c172..8b505ce 100644
--- a/ql/src/test/queries/clientnegative/ctasnullcol.q
+++ b/ql/src/test/queries/clientnegative/ctasnullcol.q
@@ -1,2 +1,3 @@
+set hive.mapred.mode=nonstrict;
 drop table if exists orc_table_with_null;
 CREATE TABLE orc_table_with_null STORED AS ORC AS SELECT key, null FROM src; 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/delete_non_acid_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/delete_non_acid_table.q b/ql/src/test/queries/clientnegative/delete_non_acid_table.q
index ec3d803..201e322 100644
--- a/ql/src/test/queries/clientnegative/delete_non_acid_table.q
+++ b/ql/src/test/queries/clientnegative/delete_non_acid_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;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q b/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q
index a45d5a5..8623db8 100644
--- a/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q
+++ b/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.metastore.partition.name.whitelist.pattern=[^9]*;
 set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifyTableDirectoryIsEmptyHook;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/index_compact_entry_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/index_compact_entry_limit.q b/ql/src/test/queries/clientnegative/index_compact_entry_limit.q
index 5bb889c..63973e6 100644
--- a/ql/src/test/queries/clientnegative/index_compact_entry_limit.q
+++ b/ql/src/test/queries/clientnegative/index_compact_entry_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 drop index src_index on src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/index_compact_size_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/index_compact_size_limit.q b/ql/src/test/queries/clientnegative/index_compact_size_limit.q
index c6600e6..ae4e265 100644
--- a/ql/src/test/queries/clientnegative/index_compact_size_limit.q
+++ b/ql/src/test/queries/clientnegative/index_compact_size_limit.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.dbclass=fs;
 drop index src_index on src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/insert_into6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into6.q b/ql/src/test/queries/clientnegative/insert_into6.q
index a92ee5c..0feb00e 100644
--- a/ql/src/test/queries/clientnegative/insert_into6.q
+++ b/ql/src/test/queries/clientnegative/insert_into6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS insert_into6_neg;
 
 CREATE TABLE insert_into6_neg (key int, value string)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/insert_into_with_schema.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into_with_schema.q b/ql/src/test/queries/clientnegative/insert_into_with_schema.q
index 5f27e08..fe540a8 100644
--- a/ql/src/test/queries/clientnegative/insert_into_with_schema.q
+++ b/ql/src/test/queries/clientnegative/insert_into_with_schema.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- set of tests HIVE-9481
 drop database if exists x314n cascade;
 create database x314n;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/insert_into_with_schema1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into_with_schema1.q b/ql/src/test/queries/clientnegative/insert_into_with_schema1.q
index 98b762f..3765df3 100644
--- a/ql/src/test/queries/clientnegative/insert_into_with_schema1.q
+++ b/ql/src/test/queries/clientnegative/insert_into_with_schema1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- set of tests HIVE-9481
 drop database if exists x314n cascade;
 create database x314n;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/insert_into_with_schema2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into_with_schema2.q b/ql/src/test/queries/clientnegative/insert_into_with_schema2.q
index 7520ec8..c53e0a5 100644
--- a/ql/src/test/queries/clientnegative/insert_into_with_schema2.q
+++ b/ql/src/test/queries/clientnegative/insert_into_with_schema2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- set of tests HIVE-9481
 drop database if exists x314n cascade;
 create database x314n;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q b/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
index c0da913..0c58f58 100644
--- a/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
+++ b/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 explain select s1.key, s2.key

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q b/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
index 8e21963..3db7aa6 100644
--- a/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
+++ b/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 explain select s1.key, s2.key
 from src s1, src s2

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/join_nonexistent_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join_nonexistent_part.q b/ql/src/test/queries/clientnegative/join_nonexistent_part.q
index dea3406..bf60d2e 100644
--- a/ql/src/test/queries/clientnegative/join_nonexistent_part.q
+++ b/ql/src/test/queries/clientnegative/join_nonexistent_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.security.authorization.enabled = true;
 SELECT *
 FROM srcpart s1 join src s2 on s1.key == s2.key

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/limit_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/limit_partition.q b/ql/src/test/queries/clientnegative/limit_partition.q
index d593945..cc79acb 100644
--- a/ql/src/test/queries/clientnegative/limit_partition.q
+++ b/ql/src/test/queries/clientnegative/limit_partition.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.limit.query.max.table.partition=1;
 
 explain select * from srcpart limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q b/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
index ceafa27..91be988 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
@@ -1,4 +1,6 @@
+set hive.mapred.mode=nonstrict;
 -- testInvalidValueBoundary
+
 select  p_mfgr,p_name, p_size,   
 sum(p_size) over (w1) as s ,    
 dense_rank() over(w1) as dr  

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/serde_regex2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/serde_regex2.q b/ql/src/test/queries/clientnegative/serde_regex2.q
index 395cfec..a29bb9c 100644
--- a/ql/src/test/queries/clientnegative/serde_regex2.q
+++ b/ql/src/test/queries/clientnegative/serde_regex2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 USE default;
 -- Mismatch between the number of matching groups and columns, throw run time exception. Ideally this should throw a compile time exception. See JIRA-3023 for more details.
  CREATE TABLE serde_regex(

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/smb_mapjoin_14.q b/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
index 4c93542..688989a 100644
--- a/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
+++ b/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
@@ -1,5 +1,4 @@
-
-
+set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 1;
 
 CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q b/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
index e12b450..fb3bd20 100644
--- a/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
+++ b/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/union22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/union22.q b/ql/src/test/queries/clientnegative/union22.q
index 72f3314..c745d2a 100644
--- a/ql/src/test/queries/clientnegative/union22.q
+++ b/ql/src/test/queries/clientnegative/union22.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string);
 create table dst_union22_delta(k0 string, k1 string, k2 string, k3 string, k4 string, k5 string) partitioned by (ds string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientnegative/update_non_acid_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/update_non_acid_table.q b/ql/src/test/queries/clientnegative/update_non_acid_table.q
index da46141..f588f68 100644
--- a/ql/src/test/queries/clientnegative/update_non_acid_table.q
+++ b/ql/src/test/queries/clientnegative/update_non_acid_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;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/acid_globallimit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_globallimit.q b/ql/src/test/queries/clientpositive/acid_globallimit.q
index 82d8af0..e6b566f 100644
--- a/ql/src/test/queries/clientpositive/acid_globallimit.q
+++ b/ql/src/test/queries/clientpositive/acid_globallimit.q
@@ -2,7 +2,7 @@ set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.fetch.task.conversion=none;
 set hive.limit.optimize.enable=true;
-
+set hive.mapred.mode=nonstrict;
 -- Global Limit optimization does not work with ACID table. Make sure to skip it for ACID table.
 CREATE TABLE acidtest1(c1 INT, c2 STRING)
 CLUSTERED BY (c1) INTO 3 BUCKETS
@@ -15,4 +15,4 @@ explain
 select cast (c1 as string) from acidtest1 limit 10;
 select cast (c1 as string) from acidtest1 limit 10;
 
-drop table acidtest1;
\ No newline at end of file
+drop table acidtest1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/acid_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_join.q b/ql/src/test/queries/clientpositive/acid_join.q
index dca4d7d..b679100 100644
--- a/ql/src/test/queries/clientpositive/acid_join.q
+++ b/ql/src/test/queries/clientpositive/acid_join.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/d13b5db2/ql/src/test/queries/clientpositive/acid_vectorization.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_vectorization.q b/ql/src/test/queries/clientpositive/acid_vectorization.q
index 514d3fa..832909b 100644
--- a/ql/src/test/queries/clientpositive/acid_vectorization.q
+++ b/ql/src/test/queries/clientpositive/acid_vectorization.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/d13b5db2/ql/src/test/queries/clientpositive/acid_vectorization_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_vectorization_partition.q b/ql/src/test/queries/clientpositive/acid_vectorization_partition.q
index 8dd1e09..d912677 100644
--- a/ql/src/test/queries/clientpositive/acid_vectorization_partition.q
+++ b/ql/src/test/queries/clientpositive/acid_vectorization_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/d13b5db2/ql/src/test/queries/clientpositive/acid_vectorization_project.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_vectorization_project.q b/ql/src/test/queries/clientpositive/acid_vectorization_project.q
index 2a5f59a..3725cb1 100644
--- a/ql/src/test/queries/clientpositive/acid_vectorization_project.q
+++ b/ql/src/test/queries/clientpositive/acid_vectorization_project.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/d13b5db2/ql/src/test/queries/clientpositive/add_part_multiple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/add_part_multiple.q b/ql/src/test/queries/clientpositive/add_part_multiple.q
index 9248a7f..93ed787 100644
--- a/ql/src/test/queries/clientpositive/add_part_multiple.q
+++ b/ql/src/test/queries/clientpositive/add_part_multiple.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- HIVE-5122 locations for 2nd, 3rd... partition are ignored
 
 CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/allcolref_in_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/allcolref_in_udf.q b/ql/src/test/queries/clientpositive/allcolref_in_udf.q
index 020975c..ecba251 100644
--- a/ql/src/test/queries/clientpositive/allcolref_in_udf.q
+++ b/ql/src/test/queries/clientpositive/allcolref_in_udf.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain
 select concat(*),array(*) from src where key < 100 limit 10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_char2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_char2.q b/ql/src/test/queries/clientpositive/alter_char2.q
index 7fa9fce..24f9c58 100644
--- a/ql/src/test/queries/clientpositive/alter_char2.q
+++ b/ql/src/test/queries/clientpositive/alter_char2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 -- alter column type, with partitioned table
 drop table if exists alter_char2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_concatenate_indexed_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_concatenate_indexed_table.q b/ql/src/test/queries/clientpositive/alter_concatenate_indexed_table.q
index e1c3780..d2bc440 100644
--- a/ql/src/test/queries/clientpositive/alter_concatenate_indexed_table.q
+++ b/ql/src/test/queries/clientpositive/alter_concatenate_indexed_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.concatenate.check.index =false;
 create table src_rc_concatenate_test(key int, value string) stored as rcfile;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_merge.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_merge.q b/ql/src/test/queries/clientpositive/alter_merge.q
index ceabd08..0ff0294 100644
--- a/ql/src/test/queries/clientpositive/alter_merge.q
+++ b/ql/src/test/queries/clientpositive/alter_merge.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table src_rc_merge_test(key int, value string) stored as rcfile;
 
 load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_merge_2_orc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_merge_2_orc.q b/ql/src/test/queries/clientpositive/alter_merge_2_orc.q
index 990ae6b..10ba6e4 100644
--- a/ql/src/test/queries/clientpositive/alter_merge_2_orc.q
+++ b/ql/src/test/queries/clientpositive/alter_merge_2_orc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table src_orc_merge_test_part(key int, value string) partitioned by (ds string, ts string) stored as orc;
 
 alter table src_orc_merge_test_part add partition (ds='2012-01-03', ts='2012-01-03+14:46:31');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_merge_orc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_merge_orc.q b/ql/src/test/queries/clientpositive/alter_merge_orc.q
index ab6757c..9b836a6 100644
--- a/ql/src/test/queries/clientpositive/alter_merge_orc.q
+++ b/ql/src/test/queries/clientpositive/alter_merge_orc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table src_orc_merge_test(key int, value string) stored as orc;
 
 insert overwrite table src_orc_merge_test select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_rename_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_rename_table.q b/ql/src/test/queries/clientpositive/alter_rename_table.q
index 0eebd0f..2061850 100644
--- a/ql/src/test/queries/clientpositive/alter_rename_table.q
+++ b/ql/src/test/queries/clientpositive/alter_rename_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create database source;
 create database target;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_table_invalidate_column_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_table_invalidate_column_stats.q b/ql/src/test/queries/clientpositive/alter_table_invalidate_column_stats.q
index de966e8..a478451 100644
--- a/ql/src/test/queries/clientpositive/alter_table_invalidate_column_stats.q
+++ b/ql/src/test/queries/clientpositive/alter_table_invalidate_column_stats.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.metastore.try.direct.sql=true;
 
 drop database if exists statsdb1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_table_partition_drop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_table_partition_drop.q b/ql/src/test/queries/clientpositive/alter_table_partition_drop.q
index fb1d401..ab83c08 100644
--- a/ql/src/test/queries/clientpositive/alter_table_partition_drop.q
+++ b/ql/src/test/queries/clientpositive/alter_table_partition_drop.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition.mode=nonstrict;
 
 DROP TABLE IF EXISTS part_table PURGE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_varchar2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_varchar2.q b/ql/src/test/queries/clientpositive/alter_varchar2.q
index b870108..558969a 100644
--- a/ql/src/test/queries/clientpositive/alter_varchar2.q
+++ b/ql/src/test/queries/clientpositive/alter_varchar2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 -- alter column type, with partitioned table
 drop table if exists alter_varchar2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/alter_view_rename.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_view_rename.q b/ql/src/test/queries/clientpositive/alter_view_rename.q
index f91fbb8..598a942 100644
--- a/ql/src/test/queries/clientpositive/alter_view_rename.q
+++ b/ql/src/test/queries/clientpositive/alter_view_rename.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE DATABASE tv1;
 CREATE DATABASE tv2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/analyze_tbl_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/analyze_tbl_part.q b/ql/src/test/queries/clientpositive/analyze_tbl_part.q
index 179c584..bf7152b 100644
--- a/ql/src/test/queries/clientpositive/analyze_tbl_part.q
+++ b/ql/src/test/queries/clientpositive/analyze_tbl_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table src_stat_part(key string, value string) partitioned by (partitionId int);
 
 insert overwrite table src_stat_part partition (partitionId=1)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/annotate_stats_filter.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/annotate_stats_filter.q b/ql/src/test/queries/clientpositive/annotate_stats_filter.q
index 204ed87..436c053 100644
--- a/ql/src/test/queries/clientpositive/annotate_stats_filter.q
+++ b/ql/src/test/queries/clientpositive/annotate_stats_filter.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.fetch.column.stats=true;
 
 create table if not exists loc_staging (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/annotate_stats_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/annotate_stats_part.q b/ql/src/test/queries/clientpositive/annotate_stats_part.q
index f0a68a0..5bdaaff 100644
--- a/ql/src/test/queries/clientpositive/annotate_stats_part.q
+++ b/ql/src/test/queries/clientpositive/annotate_stats_part.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.fetch.column.stats=true;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/annotate_stats_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/annotate_stats_select.q b/ql/src/test/queries/clientpositive/annotate_stats_select.q
index e958a00..5aaff11 100644
--- a/ql/src/test/queries/clientpositive/annotate_stats_select.q
+++ b/ql/src/test/queries/clientpositive/annotate_stats_select.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.stats.fetch.column.stats=true;
 
 create table if not exists alltypes (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q b/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q
index 3788301..b343d78 100644
--- a/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q
+++ b/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.compat=latest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q b/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
index b046f97..37d5cf9 100644
--- a/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
+++ b/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.archive.enabled = true;
 ;
 set hive.exec.submitviachild=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/archive_multi.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/archive_multi.q b/ql/src/test/queries/clientpositive/archive_multi.q
index 0259a3e..c18f991 100644
--- a/ql/src/test/queries/clientpositive/archive_multi.q
+++ b/ql/src/test/queries/clientpositive/archive_multi.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.archive.enabled = true;
 ;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/authorization_create_temp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_create_temp_table.q b/ql/src/test/queries/clientpositive/authorization_create_temp_table.q
index 52b9ca7..bdeea81 100644
--- a/ql/src/test/queries/clientpositive/authorization_create_temp_table.q
+++ b/ql/src/test/queries/clientpositive/authorization_create_temp_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.authz.sstd.hs2.mode=true;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/authorization_explain.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_explain.q b/ql/src/test/queries/clientpositive/authorization_explain.q
index a7289d6..fe376bf 100644
--- a/ql/src/test/queries/clientpositive/authorization_explain.q
+++ b/ql/src/test/queries/clientpositive/authorization_explain.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.security.authorization.enabled=true;
 
 -- JAVA_VERSION_SPECIFIC_OUTPUT

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/authorization_parts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_parts.q b/ql/src/test/queries/clientpositive/authorization_parts.q
index 141cdea..18582fc 100644
--- a/ql/src/test/queries/clientpositive/authorization_parts.q
+++ b/ql/src/test/queries/clientpositive/authorization_parts.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.test.authz.sstd.hs2.mode=true;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join0.q b/ql/src/test/queries/clientpositive/auto_join0.q
index 24647fc..1e1e7d1 100644
--- a/ql/src/test/queries/clientpositive/auto_join0.q
+++ b/ql/src/test/queries/clientpositive/auto_join0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join1.q b/ql/src/test/queries/clientpositive/auto_join1.q
index 3aec73f..7973c4b 100644
--- a/ql/src/test/queries/clientpositive/auto_join1.q
+++ b/ql/src/test/queries/clientpositive/auto_join1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join =true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join10.q b/ql/src/test/queries/clientpositive/auto_join10.q
index 2dbdcf7..dad21c5 100644
--- a/ql/src/test/queries/clientpositive/auto_join10.q
+++ b/ql/src/test/queries/clientpositive/auto_join10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join11.q b/ql/src/test/queries/clientpositive/auto_join11.q
index d8045b1..c56df2d 100644
--- a/ql/src/test/queries/clientpositive/auto_join11.q
+++ b/ql/src/test/queries/clientpositive/auto_join11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join12.q b/ql/src/test/queries/clientpositive/auto_join12.q
index b31e4f7..55cd6e9 100644
--- a/ql/src/test/queries/clientpositive/auto_join12.q
+++ b/ql/src/test/queries/clientpositive/auto_join12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 set hive.auto.convert.join = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join13.q b/ql/src/test/queries/clientpositive/auto_join13.q
index c116eba..ecf4c3b 100644
--- a/ql/src/test/queries/clientpositive/auto_join13.q
+++ b/ql/src/test/queries/clientpositive/auto_join13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join14.q b/ql/src/test/queries/clientpositive/auto_join14.q
index bfd942d..6ad1fed 100644
--- a/ql/src/test/queries/clientpositive/auto_join14.q
+++ b/ql/src/test/queries/clientpositive/auto_join14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join16.q b/ql/src/test/queries/clientpositive/auto_join16.q
index 0ade940..3440817 100644
--- a/ql/src/test/queries/clientpositive/auto_join16.q
+++ b/ql/src/test/queries/clientpositive/auto_join16.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join17.q b/ql/src/test/queries/clientpositive/auto_join17.q
index 4bb804e..43c5860 100644
--- a/ql/src/test/queries/clientpositive/auto_join17.q
+++ b/ql/src/test/queries/clientpositive/auto_join17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join18.q b/ql/src/test/queries/clientpositive/auto_join18.q
index 7a3d6c9..1340bf0 100644
--- a/ql/src/test/queries/clientpositive/auto_join18.q
+++ b/ql/src/test/queries/clientpositive/auto_join18.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.auto.convert.join = true;
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q b/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q
index 7465bc9..67400bd 100644
--- a/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join19.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join19.q b/ql/src/test/queries/clientpositive/auto_join19.q
index 32935f1..532a21e 100644
--- a/ql/src/test/queries/clientpositive/auto_join19.q
+++ b/ql/src/test/queries/clientpositive/auto_join19.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join2.q b/ql/src/test/queries/clientpositive/auto_join2.q
index f598ccb..239162e 100644
--- a/ql/src/test/queries/clientpositive/auto_join2.q
+++ b/ql/src/test/queries/clientpositive/auto_join2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join22.q b/ql/src/test/queries/clientpositive/auto_join22.q
index b5eec90..ffe9e95 100644
--- a/ql/src/test/queries/clientpositive/auto_join22.q
+++ b/ql/src/test/queries/clientpositive/auto_join22.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 explain
 SELECT sum(hash(src5.src1_value)) FROM (SELECT src3.*, src4.value as src4_value, src4.key as src4_key FROM src src4 JOIN (SELECT src2.*, src1.key as src1_key, src1.value as src1_value FROM src src1 JOIN src src2 ON src1.key = src2.key) src3 ON src3.src1_key = src4.key) src5;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join23.q b/ql/src/test/queries/clientpositive/auto_join23.q
index 1259f78..4314f73 100644
--- a/ql/src/test/queries/clientpositive/auto_join23.q
+++ b/ql/src/test/queries/clientpositive/auto_join23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join24.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join24.q b/ql/src/test/queries/clientpositive/auto_join24.q
index e8b2648..c800164 100644
--- a/ql/src/test/queries/clientpositive/auto_join24.q
+++ b/ql/src/test/queries/clientpositive/auto_join24.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 create table tst1(key STRING, cnt INT);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join25.q b/ql/src/test/queries/clientpositive/auto_join25.q
index b8734ab..8d5a841 100644
--- a/ql/src/test/queries/clientpositive/auto_join25.q
+++ b/ql/src/test/queries/clientpositive/auto_join25.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
 
 set hive.auto.convert.join = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join26.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join26.q b/ql/src/test/queries/clientpositive/auto_join26.q
index 8987637..44a4a30 100644
--- a/ql/src/test/queries/clientpositive/auto_join26.q
+++ b/ql/src/test/queries/clientpositive/auto_join26.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key INT, cnt INT);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join27.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join27.q b/ql/src/test/queries/clientpositive/auto_join27.q
index 2dc5845..f3c5004 100644
--- a/ql/src/test/queries/clientpositive/auto_join27.q
+++ b/ql/src/test/queries/clientpositive/auto_join27.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join3.q b/ql/src/test/queries/clientpositive/auto_join3.q
index 9547654..8f10786 100644
--- a/ql/src/test/queries/clientpositive/auto_join3.q
+++ b/ql/src/test/queries/clientpositive/auto_join3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join32.q b/ql/src/test/queries/clientpositive/auto_join32.q
index e7846ee..7725f72 100644
--- a/ql/src/test/queries/clientpositive/auto_join32.q
+++ b/ql/src/test/queries/clientpositive/auto_join32.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 
 -- empty tables

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join33.q b/ql/src/test/queries/clientpositive/auto_join33.q
index a0a7a0e..654a826 100644
--- a/ql/src/test/queries/clientpositive/auto_join33.q
+++ b/ql/src/test/queries/clientpositive/auto_join33.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join4.q b/ql/src/test/queries/clientpositive/auto_join4.q
index 1c2ad5f..5a582d3 100644
--- a/ql/src/test/queries/clientpositive/auto_join4.q
+++ b/ql/src/test/queries/clientpositive/auto_join4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join5.q b/ql/src/test/queries/clientpositive/auto_join5.q
index 9456292..0dd844c 100644
--- a/ql/src/test/queries/clientpositive/auto_join5.q
+++ b/ql/src/test/queries/clientpositive/auto_join5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join6.q b/ql/src/test/queries/clientpositive/auto_join6.q
index a0f8e55..b00c7f4 100644
--- a/ql/src/test/queries/clientpositive/auto_join6.q
+++ b/ql/src/test/queries/clientpositive/auto_join6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join7.q b/ql/src/test/queries/clientpositive/auto_join7.q
index ca10560..091a37e 100644
--- a/ql/src/test/queries/clientpositive/auto_join7.q
+++ b/ql/src/test/queries/clientpositive/auto_join7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join8.q b/ql/src/test/queries/clientpositive/auto_join8.q
index 553fc25..32d6b2d 100644
--- a/ql/src/test/queries/clientpositive/auto_join8.q
+++ b/ql/src/test/queries/clientpositive/auto_join8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join9.q b/ql/src/test/queries/clientpositive/auto_join9.q
index fb3eafb..3b74153 100644
--- a/ql/src/test/queries/clientpositive/auto_join9.q
+++ b/ql/src/test/queries/clientpositive/auto_join9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join_filters.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_filters.q b/ql/src/test/queries/clientpositive/auto_join_filters.q
index eefd211..2da8bae 100644
--- a/ql/src/test/queries/clientpositive/auto_join_filters.q
+++ b/ql/src/test/queries/clientpositive/auto_join_filters.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/d13b5db2/ql/src/test/queries/clientpositive/auto_join_nulls.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_nulls.q b/ql/src/test/queries/clientpositive/auto_join_nulls.q
index d1b7bb4..279fd32 100644
--- a/ql/src/test/queries/clientpositive/auto_join_nulls.q
+++ b/ql/src/test/queries/clientpositive/auto_join_nulls.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/d13b5db2/ql/src/test/queries/clientpositive/auto_join_reordering_values.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_reordering_values.q b/ql/src/test/queries/clientpositive/auto_join_reordering_values.q
index 55bd975..39b2e1d 100644
--- a/ql/src/test/queries/clientpositive/auto_join_reordering_values.q
+++ b/ql/src/test/queries/clientpositive/auto_join_reordering_values.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- HIVE-5056 RS has expression list for values, but it's ignored in MapJoinProcessor
 
 create table testsrc ( `key` int,`val` string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join_stats2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_stats2.q b/ql/src/test/queries/clientpositive/auto_join_stats2.q
index bf39c95..6f9140a 100644
--- a/ql/src/test/queries/clientpositive/auto_join_stats2.q
+++ b/ql/src/test/queries/clientpositive/auto_join_stats2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 
 -- Auto_join2 no longer tests merging the mapjoin work if big-table selection is based on stats, as src3 is smaller statistically than src1 + src2.

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_without_localtask.q b/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
index 47c66d2..6438908 100644
--- a/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
+++ b/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.use.nonstaged=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_smb_mapjoin_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_smb_mapjoin_14.q b/ql/src/test/queries/clientpositive/auto_smb_mapjoin_14.q
index 4dca15b..666ae75 100644
--- a/ql/src/test/queries/clientpositive/auto_smb_mapjoin_14.q
+++ b/ql/src/test/queries/clientpositive/auto_smb_mapjoin_14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 ;
 
 set hive.exec.reducers.max = 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
index ddd2c18..6c2fbba 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 1 part, 2 bucket & big 2 part, 4 bucket
 
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
index 73e98dd..aa345b5 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 1 part, 2 bucket & big 2 part, 4 bucket
 
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
index f434b33..b344bd0 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 1 part, 2 bucket & big 2 part, 4 bucket
 
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string)

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

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_15.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_15.q
index 64b3e5f..1480b15 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_15.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_15.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 ;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
index eef5483..2cf809b 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 1 part, 4 bucket & big 2 part, 2 bucket
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
index c094ecd..b14b32b 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 2 part, 2 bucket & big 1 part, 4 bucket
 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/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
index 18acfbf..b08649e 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 2 part, 4 bucket & big 1 part, 2 bucket
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
index 75c930c..489f556 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small no part, 4 bucket & big no part, 2 bucket
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
index 33fe283..25eeee3 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 ;
 
 set hive.exec.reducers.max = 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
index e19cc31..161bc8a 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 2 part, 4 bucket & big 2 part, 2 bucket
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
index 734d2b3..1bd5da4 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.submitviachild=true;
 set hive.exec.submit.local.task.via.child=true;
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/autogen_colalias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autogen_colalias.q b/ql/src/test/queries/clientpositive/autogen_colalias.q
index dac0bf7..5bbd433 100644
--- a/ql/src/test/queries/clientpositive/autogen_colalias.q
+++ b/ql/src/test/queries/clientpositive/autogen_colalias.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TEMPORARY FUNCTION test_max AS 'org.apache.hadoop.hive.ql.udf.UDAFTestMax';
 
 create table dest_grouped_old1 as select 1+1, 2+2 as zz, src.key, test_max(length(src.value)), count(src.value), sin(count(src.value)), count(sin(src.value)), current_timestamp(), CAST(SUM(IF(value > 10, value, 1)) AS INT), if(src.key > 1,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/avro_add_column3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_add_column3.q b/ql/src/test/queries/clientpositive/avro_add_column3.q
index f33ee03..2d9cb6f 100644
--- a/ql/src/test/queries/clientpositive/avro_add_column3.q
+++ b/ql/src/test/queries/clientpositive/avro_add_column3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 -- verify that we can actually read avro files

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/avro_date.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_date.q b/ql/src/test/queries/clientpositive/avro_date.q
index 0405bae..15c07de 100644
--- a/ql/src/test/queries/clientpositive/avro_date.q
+++ b/ql/src/test/queries/clientpositive/avro_date.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- JAVA_VERSION_SPECIFIC_OUTPUT
 
 DROP TABLE avro_date_staging;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/avro_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_partitioned.q b/ql/src/test/queries/clientpositive/avro_partitioned.q
index 9e6c79a..d475dff 100644
--- a/ql/src/test/queries/clientpositive/avro_partitioned.q
+++ b/ql/src/test/queries/clientpositive/avro_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- Verify that table scans work with partitioned Avro tables
 CREATE TABLE episodes
@@ -144,6 +145,6 @@ WITH SERDEPROPERTIES ('avro.schema.literal'='{
   ]
 }');
 
-reset hive.metastore.disallow.incompatible.col.type.changes;
 -- Try selecting from the evolved table
 SELECT * FROM episodes_partitioned_serdeproperties;
+reset hive.metastore.disallow.incompatible.col.type.changes;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/avro_partitioned_native.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_partitioned_native.q b/ql/src/test/queries/clientpositive/avro_partitioned_native.q
index 0e261b3..a1df72b 100644
--- a/ql/src/test/queries/clientpositive/avro_partitioned_native.q
+++ b/ql/src/test/queries/clientpositive/avro_partitioned_native.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- Verify that table scans work with partitioned Avro tables
 CREATE TABLE episodes (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/avro_schema_evolution_native.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_schema_evolution_native.q b/ql/src/test/queries/clientpositive/avro_schema_evolution_native.q
index ff155f7..b32e1ec 100644
--- a/ql/src/test/queries/clientpositive/avro_schema_evolution_native.q
+++ b/ql/src/test/queries/clientpositive/avro_schema_evolution_native.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- Verify that table scans work with partitioned Avro tables
 CREATE TABLE episodes (

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/avro_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_timestamp.q b/ql/src/test/queries/clientpositive/avro_timestamp.q
index d17fdc6..7bf0dc8 100644
--- a/ql/src/test/queries/clientpositive/avro_timestamp.q
+++ b/ql/src/test/queries/clientpositive/avro_timestamp.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Exclude test on Windows due to space character being escaped in Hive paths on Windows.
 -- EXCLUDE_OS_WINDOWS
 -- JAVA_VERSION_SPECIFIC_OUTPUT

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucket6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket6.q b/ql/src/test/queries/clientpositive/bucket6.q
index a12f6bd..0484d33 100644
--- a/ql/src/test/queries/clientpositive/bucket6.q
+++ b/ql/src/test/queries/clientpositive/bucket6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE src_bucket(key STRING, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucket_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_groupby.q b/ql/src/test/queries/clientpositive/bucket_groupby.q
index a531ba7..ea35bd7 100644
--- a/ql/src/test/queries/clientpositive/bucket_groupby.q
+++ b/ql/src/test/queries/clientpositive/bucket_groupby.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table clustergroupby(key string, value string) partitioned by(ds string);
 describe extended clustergroupby;
 alter table clustergroupby clustered by (key) into 1 buckets;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q
index fed7db7..3f9ccc4 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark1.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/d13b5db2/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q
index a4015fe..4a70671 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark2.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/d13b5db2/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q
index e4a6e4a..9ae7986 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark3.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 2 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
 load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
index 4b75685..3fa7a04 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 ;
 
 set hive.exec.reducers.max = 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucket_map_join_tez1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_tez1.q b/ql/src/test/queries/clientpositive/bucket_map_join_tez1.q
index 40dad17..8ed630e 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_tez1.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_tez1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q b/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q
index 1e7db5e..fd997df 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucketcontext_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_1.q b/ql/src/test/queries/clientpositive/bucketcontext_1.q
index 047a2a5..ad0f473 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_1.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 1 part, 2 bucket & big 2 part, 4 bucket
 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');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucketcontext_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_2.q b/ql/src/test/queries/clientpositive/bucketcontext_2.q
index d58e844..931f55a 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_2.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 1 part, 4 bucket & big 2 part, 2 bucket
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucketcontext_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_3.q b/ql/src/test/queries/clientpositive/bucketcontext_3.q
index fd80174..e03b285 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_3.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 2 part, 2 bucket & big 1 part, 4 bucket
 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');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucketcontext_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_4.q b/ql/src/test/queries/clientpositive/bucketcontext_4.q
index 5d21ea5..af08f07 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_4.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 2 part, 4 bucket & big 1 part, 2 bucket
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucketcontext_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_6.q b/ql/src/test/queries/clientpositive/bucketcontext_6.q
index 0f7c72f..5549f3b 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_6.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small no part, 4 bucket & big 2 part, 2 bucket
 CREATE TABLE bucket_small (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucketcontext_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_7.q b/ql/src/test/queries/clientpositive/bucketcontext_7.q
index c528f61..44cdb5e 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_7.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 2 part, 4 bucket & big 2 part, 2 bucket
 CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucketcontext_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_8.q b/ql/src/test/queries/clientpositive/bucketcontext_8.q
index 27c55a3..bb655e2 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_8.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- small 2 part, 2 bucket & big 2 part, 4 bucket
 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');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/bucketizedhiveinputformat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat.q b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat.q
index 755eb06..dc48ee6 100644
--- a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat.q
+++ b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapred.max.split.size = 32000000;
 
 CREATE TABLE T1(name STRING) STORED AS TEXTFILE;


[4/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode should be strict (Ashutosh Chauhan via Prasanth J)

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert_values_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_values_partitioned.q b/ql/src/test/queries/clientpositive/insert_values_partitioned.q
index e78b92e..f3e4e47 100644
--- a/ql/src/test/queries/clientpositive/insert_values_partitioned.q
+++ b/ql/src/test/queries/clientpositive/insert_values_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/d13b5db2/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_values_tmp_table.q b/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
index 07737c0..082b2c0 100644
--- a/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
+++ b/ql/src/test/queries/clientpositive/insert_values_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/d13b5db2/ql/src/test/queries/clientpositive/interval_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/interval_3.q b/ql/src/test/queries/clientpositive/interval_3.q
index dec9bed..3b05448 100644
--- a/ql/src/test/queries/clientpositive/interval_3.q
+++ b/ql/src/test/queries/clientpositive/interval_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- where clause
 select
   l_orderkey, l_shipdate, l_receiptdate

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join0.q b/ql/src/test/queries/clientpositive/join0.q
index 6ef6843..66f2ef3 100644
--- a/ql/src/test/queries/clientpositive/join0.q
+++ b/ql/src/test/queries/clientpositive/join0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- JAVA_VERSION_SPECIFIC_OUTPUT
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join1.q b/ql/src/test/queries/clientpositive/join1.q
index de97e8c..72bd611 100644
--- a/ql/src/test/queries/clientpositive/join1.q
+++ b/ql/src/test/queries/clientpositive/join1.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/d13b5db2/ql/src/test/queries/clientpositive/join10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join10.q b/ql/src/test/queries/clientpositive/join10.q
index 03cd81d..c3cbfea 100644
--- a/ql/src/test/queries/clientpositive/join10.q
+++ b/ql/src/test/queries/clientpositive/join10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 EXPLAIN FROM 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join11.q b/ql/src/test/queries/clientpositive/join11.q
index 4224a38..59c54c4 100644
--- a/ql/src/test/queries/clientpositive/join11.q
+++ b/ql/src/test/queries/clientpositive/join11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join12.q b/ql/src/test/queries/clientpositive/join12.q
index 121b2fd..6545fae 100644
--- a/ql/src/test/queries/clientpositive/join12.q
+++ b/ql/src/test/queries/clientpositive/join12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join13.q b/ql/src/test/queries/clientpositive/join13.q
index 4492ccb..4206f6a 100644
--- a/ql/src/test/queries/clientpositive/join13.q
+++ b/ql/src/test/queries/clientpositive/join13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join14.q b/ql/src/test/queries/clientpositive/join14.q
index bacd446..d4bc0ae 100644
--- a/ql/src/test/queries/clientpositive/join14.q
+++ b/ql/src/test/queries/clientpositive/join14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20S)
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join16.q b/ql/src/test/queries/clientpositive/join16.q
index 4c9c961..901f9ca 100644
--- a/ql/src/test/queries/clientpositive/join16.q
+++ b/ql/src/test/queries/clientpositive/join16.q
@@ -1 +1,2 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN SELECT subq.key, tab.value FROM (select a.key, a.value from src a where a.key > 10 ) subq JOIN src tab ON (subq.key = tab.key and subq.key > 20 and subq.value = tab.value) where tab.value < 200;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join17.q b/ql/src/test/queries/clientpositive/join17.q
index 4b6a1ef..4a7eb99 100644
--- a/ql/src/test/queries/clientpositive/join17.q
+++ b/ql/src/test/queries/clientpositive/join17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join18.q b/ql/src/test/queries/clientpositive/join18.q
index e8be582..702735d 100644
--- a/ql/src/test/queries/clientpositive/join18.q
+++ b/ql/src/test/queries/clientpositive/join18.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join19.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join19.q b/ql/src/test/queries/clientpositive/join19.q
index d5e0f42..d49a107 100644
--- a/ql/src/test/queries/clientpositive/join19.q
+++ b/ql/src/test/queries/clientpositive/join19.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join2.q b/ql/src/test/queries/clientpositive/join2.q
index 7b782b4..8aedd56 100644
--- a/ql/src/test/queries/clientpositive/join2.q
+++ b/ql/src/test/queries/clientpositive/join2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join22.q b/ql/src/test/queries/clientpositive/join22.q
index 4a67d74..525adfe 100644
--- a/ql/src/test/queries/clientpositive/join22.q
+++ b/ql/src/test/queries/clientpositive/join22.q
@@ -1,2 +1,3 @@
+set hive.mapred.mode=nonstrict;
 explain
 SELECT src5.src1_value FROM (SELECT src3.*, src4.value as src4_value, src4.key as src4_key FROM src src4 JOIN (SELECT src2.*, src1.key as src1_key, src1.value as src1_value FROM src src1 JOIN src src2 ON src1.key = src2.key) src3 ON src3.src1_key = src4.key) src5;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join23.q b/ql/src/test/queries/clientpositive/join23.q
index c7e78bd..d48941a 100644
--- a/ql/src/test/queries/clientpositive/join23.q
+++ b/ql/src/test/queries/clientpositive/join23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join28.q b/ql/src/test/queries/clientpositive/join28.q
index c52a195..2d96f97 100644
--- a/ql/src/test/queries/clientpositive/join28.q
+++ b/ql/src/test/queries/clientpositive/join28.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join29.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join29.q b/ql/src/test/queries/clientpositive/join29.q
index dd912fa..8b631e2 100644
--- a/ql/src/test/queries/clientpositive/join29.q
+++ b/ql/src/test/queries/clientpositive/join29.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join3.q b/ql/src/test/queries/clientpositive/join3.q
index c9c6703..af4c51b 100644
--- a/ql/src/test/queries/clientpositive/join3.q
+++ b/ql/src/test/queries/clientpositive/join3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join31.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join31.q b/ql/src/test/queries/clientpositive/join31.q
index e90467e..c79105f 100644
--- a/ql/src/test/queries/clientpositive/join31.q
+++ b/ql/src/test/queries/clientpositive/join31.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key STRING, cnt INT);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join32.q b/ql/src/test/queries/clientpositive/join32.q
index 6517fe7..d89e3c5 100644
--- a/ql/src/test/queries/clientpositive/join32.q
+++ b/ql/src/test/queries/clientpositive/join32.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join32_lessSize.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join32_lessSize.q b/ql/src/test/queries/clientpositive/join32_lessSize.q
index 63592de..cffdfc7 100644
--- a/ql/src/test/queries/clientpositive/join32_lessSize.q
+++ b/ql/src/test/queries/clientpositive/join32_lessSize.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join33.q b/ql/src/test/queries/clientpositive/join33.q
index 6517fe7..d89e3c5 100644
--- a/ql/src/test/queries/clientpositive/join33.q
+++ b/ql/src/test/queries/clientpositive/join33.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join34.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join34.q b/ql/src/test/queries/clientpositive/join34.q
index be97630..381464d 100644
--- a/ql/src/test/queries/clientpositive/join34.q
+++ b/ql/src/test/queries/clientpositive/join34.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join35.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join35.q b/ql/src/test/queries/clientpositive/join35.q
index b637f18..ed41b3e 100644
--- a/ql/src/test/queries/clientpositive/join35.q
+++ b/ql/src/test/queries/clientpositive/join35.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join4.q b/ql/src/test/queries/clientpositive/join4.q
index 94e9c14..2ab9506 100644
--- a/ql/src/test/queries/clientpositive/join4.q
+++ b/ql/src/test/queries/clientpositive/join4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join40.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join40.q b/ql/src/test/queries/clientpositive/join40.q
index 64b65e0..1e6b2b3 100644
--- a/ql/src/test/queries/clientpositive/join40.q
+++ b/ql/src/test/queries/clientpositive/join40.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.join.cache.size=1;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join41.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join41.q b/ql/src/test/queries/clientpositive/join41.q
index b8d9397..b3bea80 100644
--- a/ql/src/test/queries/clientpositive/join41.q
+++ b/ql/src/test/queries/clientpositive/join41.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table s1 as select * from src where key = 0;
 
 set hive.auto.convert.join.noconditionaltask=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join42.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join42.q b/ql/src/test/queries/clientpositive/join42.q
index f379058..a48c127 100644
--- a/ql/src/test/queries/clientpositive/join42.q
+++ b/ql/src/test/queries/clientpositive/join42.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table L as select 4436 id;
 create table LA as select 4436 loan_id, 4748 aid, 4415 pi_id;
 create table FR as select 4436 loan_id;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join43.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join43.q b/ql/src/test/queries/clientpositive/join43.q
index 68694c6..12c45a6 100644
--- a/ql/src/test/queries/clientpositive/join43.q
+++ b/ql/src/test/queries/clientpositive/join43.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table purchase_history (s string, product string, price double, time int);
 insert into purchase_history values ('1', 'Belt', 20.00, 21);
 insert into purchase_history values ('1', 'Socks', 3.50, 31);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join5.q b/ql/src/test/queries/clientpositive/join5.q
index 660ebf6..f9154ba 100644
--- a/ql/src/test/queries/clientpositive/join5.q
+++ b/ql/src/test/queries/clientpositive/join5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join6.q b/ql/src/test/queries/clientpositive/join6.q
index c62db57..7542685 100644
--- a/ql/src/test/queries/clientpositive/join6.q
+++ b/ql/src/test/queries/clientpositive/join6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join7.q b/ql/src/test/queries/clientpositive/join7.q
index 153983e..d87789f 100644
--- a/ql/src/test/queries/clientpositive/join7.q
+++ b/ql/src/test/queries/clientpositive/join7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join8.q b/ql/src/test/queries/clientpositive/join8.q
index d1b3063..5c3ad60 100644
--- a/ql/src/test/queries/clientpositive/join8.q
+++ b/ql/src/test/queries/clientpositive/join8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join9.q b/ql/src/test/queries/clientpositive/join9.q
index 80364e7..c3d6178 100644
--- a/ql/src/test/queries/clientpositive/join9.q
+++ b/ql/src/test/queries/clientpositive/join9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_acid_non_acid.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_acid_non_acid.q b/ql/src/test/queries/clientpositive/join_acid_non_acid.q
index 43d768f..8dd5f0b 100644
--- a/ql/src/test/queries/clientpositive/join_acid_non_acid.q
+++ b/ql/src/test/queries/clientpositive/join_acid_non_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/d13b5db2/ql/src/test/queries/clientpositive/join_alt_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_alt_syntax.q b/ql/src/test/queries/clientpositive/join_alt_syntax.q
index 0658518..7bf7943 100644
--- a/ql/src/test/queries/clientpositive/join_alt_syntax.q
+++ b/ql/src/test/queries/clientpositive/join_alt_syntax.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain select p1.p_name, p2.p_name
 from part p1 , part p2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
index 4c1a384..c59e02c 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain select *
 from part p1 join part p2 join part p3 on p1.p_name = p2.p_name and p2.p_name = p3.p_name;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
index cc7ca51..0fa29c7 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain select *
 from part p1 join part p2 join part p3 on p1.p_name = p2.p_name join part p4 on p2.p_name = p3.p_name and p1.p_name = p4.p_name;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
index d158b40..f959554 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain select *
 from part p1 join part p2 join part p3 
 where p1.p_name = p2.p_name and p2.p_name = p3.p_name;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
index 6830d38..ee52342 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain select *
 from part p1 join part p2 join part p3 on p1.p_name = p2.p_name join part p4 
 where p2.p_name = p3.p_name and p1.p_name = p4.p_name;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
index 9b038f5..a8aade8 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table part2( 
     p2_partkey INT,
     p2_name STRING,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
index 0d18609..0ab61d0 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table part2( 
     p2_partkey INT,
     p2_name STRING,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
index 5478db2..fbcebe3 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table part2( 
     p2_partkey INT,
     p2_name STRING,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
index 152c77c..160c291 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table part2( 
     p2_partkey INT,
     p2_name STRING,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_empty.q b/ql/src/test/queries/clientpositive/join_empty.q
index 1982487..1409fa6 100644
--- a/ql/src/test/queries/clientpositive/join_empty.q
+++ b/ql/src/test/queries/clientpositive/join_empty.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table srcpart_empty(key int, value string) partitioned by (ds string);
 create table src2_empty (key int, value string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_filters.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_filters.q b/ql/src/test/queries/clientpositive/join_filters.q
index cd7f807..027a627 100644
--- a/ql/src/test/queries/clientpositive/join_filters.q
+++ b/ql/src/test/queries/clientpositive/join_filters.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_AND_HASH_QUERY_RESULTS
 
 CREATE TABLE myinput1(key int, value int);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_filters_overlap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_filters_overlap.q b/ql/src/test/queries/clientpositive/join_filters_overlap.q
index 83fa348..277db70 100644
--- a/ql/src/test/queries/clientpositive/join_filters_overlap.q
+++ b/ql/src/test/queries/clientpositive/join_filters_overlap.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- HIVE-3411 Filter predicates on outer join overlapped on single alias is not handled properly
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_grp_diff_keys.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_grp_diff_keys.q b/ql/src/test/queries/clientpositive/join_grp_diff_keys.q
index 571df43..fb110b4 100644
--- a/ql/src/test/queries/clientpositive/join_grp_diff_keys.q
+++ b/ql/src/test/queries/clientpositive/join_grp_diff_keys.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table split    (id int, line_id int, orders string);
 create table bar      (id int, line_id int, orders string);
 create table foo      (id int, line_id int, orders string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_hive_626.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_hive_626.q b/ql/src/test/queries/clientpositive/join_hive_626.q
index c4c239c..458d78b 100644
--- a/ql/src/test/queries/clientpositive/join_hive_626.q
+++ b/ql/src/test/queries/clientpositive/join_hive_626.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_literals.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_literals.q b/ql/src/test/queries/clientpositive/join_literals.q
index 250bf83..3c79a12 100644
--- a/ql/src/test/queries/clientpositive/join_literals.q
+++ b/ql/src/test/queries/clientpositive/join_literals.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- Test Joins with a variety of literals in the on clause
 
 SELECT COUNT(*) FROM src a JOIN src b ON a.key = b.key AND a.key = 0L;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q b/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
index baef756..6ce88ea 100644
--- a/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
+++ b/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 -- SORT_QUERY_RESULTS
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_merging.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_merging.q b/ql/src/test/queries/clientpositive/join_merging.q
index aedbb37..4efb860 100644
--- a/ql/src/test/queries/clientpositive/join_merging.q
+++ b/ql/src/test/queries/clientpositive/join_merging.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 explain select p1.p_size, p2.p_size 
 from part p1 left outer join part p2 on p1.p_partkey = p2.p_partkey 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_nulls.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_nulls.q b/ql/src/test/queries/clientpositive/join_nulls.q
index 6a2a7df..09c55af 100644
--- a/ql/src/test/queries/clientpositive/join_nulls.q
+++ b/ql/src/test/queries/clientpositive/join_nulls.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE myinput1(key int, value int);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_on_varchar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_on_varchar.q b/ql/src/test/queries/clientpositive/join_on_varchar.q
index 2cf261e..a1ce1ff 100644
--- a/ql/src/test/queries/clientpositive/join_on_varchar.q
+++ b/ql/src/test/queries/clientpositive/join_on_varchar.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 create table tbl1(c1 varchar(10), intcol int);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_parse.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_parse.q b/ql/src/test/queries/clientpositive/join_parse.q
index 5955efd..080933c 100644
--- a/ql/src/test/queries/clientpositive/join_parse.q
+++ b/ql/src/test/queries/clientpositive/join_parse.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 explain
 select srcpart.key, src1.value from
 ((srcpart inner join src on srcpart.key = src.key))

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_rc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_rc.q b/ql/src/test/queries/clientpositive/join_rc.q
index b2e8c38..b02db62 100644
--- a/ql/src/test/queries/clientpositive/join_rc.q
+++ b/ql/src/test/queries/clientpositive/join_rc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 create table join_rc1(key string, value string) stored as RCFile;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_reorder.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_reorder.q b/ql/src/test/queries/clientpositive/join_reorder.q
index 8846113..55aaaed 100644
--- a/ql/src/test/queries/clientpositive/join_reorder.q
+++ b/ql/src/test/queries/clientpositive/join_reorder.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_star.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_star.q b/ql/src/test/queries/clientpositive/join_star.q
index c95a13b..70cc8f7 100644
--- a/ql/src/test/queries/clientpositive/join_star.q
+++ b/ql/src/test/queries/clientpositive/join_star.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table fact(m1 int, m2 int, d1 int, d2 int);
 create table dim1(f1 int, f2 int);
 create table dim2(f3 int, f4 int);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_vc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_vc.q b/ql/src/test/queries/clientpositive/join_vc.q
index 3f2190e..6d2d9c5 100644
--- a/ql/src/test/queries/clientpositive/join_vc.q
+++ b/ql/src/test/queries/clientpositive/join_vc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- see HIVE-4033 earlier a flag named hasVC was not initialized correctly in MapOperator.java, resulting in NPE for following query. order by and limit in the query is not relevant, problem would be evident even without those. They are there to keep .q.out file small and sorted.
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/leftsemijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/leftsemijoin.q b/ql/src/test/queries/clientpositive/leftsemijoin.q
index 76cf6fb..71c3a0d 100644
--- a/ql/src/test/queries/clientpositive/leftsemijoin.q
+++ b/ql/src/test/queries/clientpositive/leftsemijoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 drop table sales;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/limit_join_transpose.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_join_transpose.q b/ql/src/test/queries/clientpositive/limit_join_transpose.q
index bfc2378..98eefe9 100644
--- a/ql/src/test/queries/clientpositive/limit_join_transpose.q
+++ b/ql/src/test/queries/clientpositive/limit_join_transpose.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.limitjointranspose=false;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q b/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
index 85125ea..42c5feb 100644
--- a/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
+++ b/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.limit.query.max.table.partition=1;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/limit_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown.q b/ql/src/test/queries/clientpositive/limit_pushdown.q
index 74030e3..a2aeaed 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.limit.pushdown.memory.usage=0.3f;
 set hive.optimize.reducededuplication.min.reducer=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown_negative.q b/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
index e17ded1..95c491c 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.limit.pushdown.memory.usage=0.3f;
 
 -- negative, RS + join

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/lineage1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage1.q b/ql/src/test/queries/clientpositive/lineage1.q
index 4743b7f..b5b099b 100644
--- a/ql/src/test/queries/clientpositive/lineage1.q
+++ b/ql/src/test/queries/clientpositive/lineage1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 
 CREATE TABLE dest_l1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/lineage2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage2.q b/ql/src/test/queries/clientpositive/lineage2.q
index d3fe64a..31694cb 100644
--- a/ql/src/test/queries/clientpositive/lineage2.q
+++ b/ql/src/test/queries/clientpositive/lineage2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
 
 drop table if exists src2;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/lineage3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage3.q b/ql/src/test/queries/clientpositive/lineage3.q
index d1fb454..c907e21 100644
--- a/ql/src/test/queries/clientpositive/lineage3.q
+++ b/ql/src/test/queries/clientpositive/lineage3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 drop table if exists d1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_1.q b/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
index 1f3b616..e38930f 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_11.q b/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
index 80e6a97..2d22d66 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapred.input.dir.recursive=true;
 set hive.merge.mapfiles=false;	
 set hive.merge.mapredfiles=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_12.q b/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
index 7c1a67c..ac063cc 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapred.input.dir.recursive=true;
 set hive.merge.mapfiles=false;	
 set hive.merge.mapredfiles=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_13.q b/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
index b355147..d68ca93 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapred.input.dir.recursive=true;
 set hive.merge.mapfiles=false;	
 set hive.merge.mapredfiles=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_2.q b/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
index 5970f1b..263a002 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_3.q b/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
index 53f0a24..ef01529 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_4.q b/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
index f863dde..86ff342 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_5.q b/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
index cc14529..ace7ba9 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_6.q b/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
index d25ff63..5684788 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_7.q b/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
index a74b7cf..e2af1b3 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_8.q b/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
index 85cea9d..d904543 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_9.q b/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
index 175f812..620750c 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
index 13d2e16..1a4fbc2 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.listbucketing=true;
 set mapred.input.dir.recursive=true;	
 set hive.merge.mapfiles=false;	

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
index 532188b..996dce6 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.listbucketing=true;
 set mapred.input.dir.recursive=true;	
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
index 2fd7b13..f09026f 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.listbucketing=true;
 set mapred.input.dir.recursive=true;	
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
index c3912dc..cc597dc 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.listbucketing=true;
 set mapred.input.dir.recursive=true;	
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
index 7bdb3b2..fb4cf6d 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.listbucketing=true;
 set mapred.input.dir.recursive=true;	
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;	

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
index d34c52a..702de64 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.listbucketing=true;
 set mapred.input.dir.recursive=true;	
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/llap_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_partitioned.q b/ql/src/test/queries/clientpositive/llap_partitioned.q
index 2e0c07a..41d17aa 100644
--- a/ql/src/test/queries/clientpositive/llap_partitioned.q
+++ b/ql/src/test/queries/clientpositive/llap_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 
 SET hive.llap.io.enabled=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/llapdecider.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llapdecider.q b/ql/src/test/queries/clientpositive/llapdecider.q
index 52cdf77..ab9f5e0 100644
--- a/ql/src/test/queries/clientpositive/llapdecider.q
+++ b/ql/src/test/queries/clientpositive/llapdecider.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.stats.fetch.column.stats=true;
 set hive.execution.mode=llap;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/load_dyn_part13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part13.q b/ql/src/test/queries/clientpositive/load_dyn_part13.q
index 0b8d44f..28b9aca 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part13.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 show partitions srcpart;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/louter_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/louter_join_ppr.q b/ql/src/test/queries/clientpositive/louter_join_ppr.q
index 90d6724..ef6f541 100644
--- a/ql/src/test/queries/clientpositive/louter_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/louter_join_ppr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/macro_duplicate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/macro_duplicate.q b/ql/src/test/queries/clientpositive/macro_duplicate.q
index f0afd79..1b27268 100644
--- a/ql/src/test/queries/clientpositive/macro_duplicate.q
+++ b/ql/src/test/queries/clientpositive/macro_duplicate.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table macro_testing;
 CREATE TABLE macro_testing(a int, b int, c int);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_decimal.q b/ql/src/test/queries/clientpositive/mapjoin_decimal.q
index 105195b..1f3b081 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_decimal.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_decimal.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q b/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
index 9723b3a..f4ea69d 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_memcheck.q b/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
index faddbee..9ca1fa2 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_subquery.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_subquery.q b/ql/src/test/queries/clientpositive/mapjoin_subquery.q
index d0b58d5..ebd584e 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_subquery.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_subquery.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;
 set hive.auto.convert.join.noconditionaltask.size=10000;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_subquery2.q b/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
index aed8990..95051d4 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table x;
 drop table y;
 drop table z;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapreduce2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapreduce2.q b/ql/src/test/queries/clientpositive/mapreduce2.q
index 0398b49..5a19b3c 100644
--- a/ql/src/test/queries/clientpositive/mapreduce2.q
+++ b/ql/src/test/queries/clientpositive/mapreduce2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge1.q b/ql/src/test/queries/clientpositive/merge1.q
index 847a50b..e64492b 100644
--- a/ql/src/test/queries/clientpositive/merge1.q
+++ b/ql/src/test/queries/clientpositive/merge1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.mapredfiles=true;
 set hive.merge.sparkfiles=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge2.q b/ql/src/test/queries/clientpositive/merge2.q
index c36a909..c719716 100644
--- a/ql/src/test/queries/clientpositive/merge2.q
+++ b/ql/src/test/queries/clientpositive/merge2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.mapfiles=true;
 set hive.merge.mapredfiles=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge3.q b/ql/src/test/queries/clientpositive/merge3.q
index 7091dbc..98b15d5 100644
--- a/ql/src/test/queries/clientpositive/merge3.q
+++ b/ql/src/test/queries/clientpositive/merge3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge4.q b/ql/src/test/queries/clientpositive/merge4.q
index ca3cedf..14aca1a 100644
--- a/ql/src/test/queries/clientpositive/merge4.q
+++ b/ql/src/test/queries/clientpositive/merge4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.merge.mapfiles=true;
 set hive.merge.mapredfiles=true;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
index 848c45f..fa4d442 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
index 5897170..33388c6 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- this test verifies that the block merge task that can follow a query to generate dynamic
 -- partitions does not produce incorrect results by dropping partitions
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
index 9f64724..9a35101 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- this is to test the case where some dynamic partitions are merged and some are moved
 
 create table srcpart_merge_dp like srcpart;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mergejoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoin.q b/ql/src/test/queries/clientpositive/mergejoin.q
index 82e1c93..fa53a76 100644
--- a/ql/src/test/queries/clientpositive/mergejoin.q
+++ b/ql/src/test/queries/clientpositive/mergejoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.join.emit.interval=100000;
 set hive.optimize.ppd=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mergejoins.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoins.q b/ql/src/test/queries/clientpositive/mergejoins.q
index 2857c86..2c11b3a 100644
--- a/ql/src/test/queries/clientpositive/mergejoins.q
+++ b/ql/src/test/queries/clientpositive/mergejoins.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table a (val1 int, val2 int);
 create table b (val1 int, val2 int);
 create table c (val1 int, val2 int);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mergejoins_mixed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoins_mixed.q b/ql/src/test/queries/clientpositive/mergejoins_mixed.q
index a7df4e3..51f04cd 100644
--- a/ql/src/test/queries/clientpositive/mergejoins_mixed.q
+++ b/ql/src/test/queries/clientpositive/mergejoins_mixed.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- HIVE-3464
 
 create table a (key string, value string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q b/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
index d530f6a..77fa654 100644
--- a/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
+++ b/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 select key from(
 select '1' as key from srcpart where ds="2008-04-09"
 UNION all

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/metadata_only_queries.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/metadata_only_queries.q b/ql/src/test/queries/clientpositive/metadata_only_queries.q
index 7fea6b5..bce121d 100644
--- a/ql/src/test/queries/clientpositive/metadata_only_queries.q
+++ b/ql/src/test/queries/clientpositive/metadata_only_queries.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.compute.query.using.stats=true;
 set hive.stats.autogather=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/metadataonly1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/metadataonly1.q b/ql/src/test/queries/clientpositive/metadataonly1.q
index eb59529..5420ea9 100644
--- a/ql/src/test/queries/clientpositive/metadataonly1.q
+++ b/ql/src/test/queries/clientpositive/metadataonly1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE TEST1(A INT, B DOUBLE) partitioned by (ds string);
 explain extended select max(ds) from TEST1;
 select max(ds) from TEST1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mi.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mi.q b/ql/src/test/queries/clientpositive/mi.q
index 52578bc..b79b869 100644
--- a/ql/src/test/queries/clientpositive/mi.q
+++ b/ql/src/test/queries/clientpositive/mi.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mrr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mrr.q b/ql/src/test/queries/clientpositive/mrr.q
index a8eddaf..324f2b1 100644
--- a/ql/src/test/queries/clientpositive/mrr.q
+++ b/ql/src/test/queries/clientpositive/mrr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join.noconditionaltask.size=60000000;
 set hive.log.trace.id=mrrTest;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multiMapJoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multiMapJoin1.q b/ql/src/test/queries/clientpositive/multiMapJoin1.q
index 455f550..5c49b4c 100644
--- a/ql/src/test/queries/clientpositive/multiMapJoin1.q
+++ b/ql/src/test/queries/clientpositive/multiMapJoin1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
 
 create table smallTbl1(key string, value string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multiMapJoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multiMapJoin2.q b/ql/src/test/queries/clientpositive/multiMapJoin2.q
index 141db4d..cf5dbb0 100644
--- a/ql/src/test/queries/clientpositive/multiMapJoin2.q
+++ b/ql/src/test/queries/clientpositive/multiMapJoin2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_column_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_column_in.q b/ql/src/test/queries/clientpositive/multi_column_in.q
index 18a56cc..288406c 100644
--- a/ql/src/test/queries/clientpositive/multi_column_in.q
+++ b/ql/src/test/queries/clientpositive/multi_column_in.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table emps;
 
 create table emps (empno int, deptno int, empname string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_insert_gby2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_gby2.q b/ql/src/test/queries/clientpositive/multi_insert_gby2.q
index fa29261..c23c854 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_gby2.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_gby2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 --HIVE-3699 Multiple insert overwrite into multiple tables query stores same results in all tables
 create table e1 (count int);
 create table e2 (percentile double);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_insert_gby3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_gby3.q b/ql/src/test/queries/clientpositive/multi_insert_gby3.q
index d85ff9a..68f6644 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_gby3.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_gby3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 create table e1 (key string, keyD double);
 create table e2 (key string, keyD double, value string);

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_insert_mixed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_mixed.q b/ql/src/test/queries/clientpositive/multi_insert_mixed.q
index 8fb577a..7be6d13 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_mixed.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_mixed.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 create table src_multi1 like src;
 create table src_multi2 like src;
 create table src_multi3 like src;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_insert_union_src.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_union_src.q b/ql/src/test/queries/clientpositive/multi_insert_union_src.q
index f9b6f87..fa6be17 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_union_src.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_union_src.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 drop table if exists src2;
 drop table if exists src_multi1;
 drop table if exists src_multi1;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_join_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_join_union.q b/ql/src/test/queries/clientpositive/multi_join_union.q
index c555b38..2bdc921 100644
--- a/ql/src/test/queries/clientpositive/multi_join_union.q
+++ b/ql/src/test/queries/clientpositive/multi_join_union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/newline.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/newline.q b/ql/src/test/queries/clientpositive/newline.q
index 49e9437..e7dcb62 100644
--- a/ql/src/test/queries/clientpositive/newline.q
+++ b/ql/src/test/queries/clientpositive/newline.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 add file ../../data/scripts/newline.py;
 set hive.transform.escape.input=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/no_hooks.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/no_hooks.q b/ql/src/test/queries/clientpositive/no_hooks.q
index bbd1fea..7e80a9d 100644
--- a/ql/src/test/queries/clientpositive/no_hooks.q
+++ b/ql/src/test/queries/clientpositive/no_hooks.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.pre.hooks=;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/noalias_subq1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/noalias_subq1.q b/ql/src/test/queries/clientpositive/noalias_subq1.q
index dca8a42..cf49301 100644
--- a/ql/src/test/queries/clientpositive/noalias_subq1.q
+++ b/ql/src/test/queries/clientpositive/noalias_subq1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT c1 FROM (select value as c1, key as c2 from src) x where c2 < 100;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q b/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
index 4b762fd..77dee5a 100644
--- a/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
+++ b/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 -- negative, references twice for result of funcion

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nonmr_fetch.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonmr_fetch.q b/ql/src/test/queries/clientpositive/nonmr_fetch.q
index 2a52888..a446217 100644
--- a/ql/src/test/queries/clientpositive/nonmr_fetch.q
+++ b/ql/src/test/queries/clientpositive/nonmr_fetch.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=minimal;
 set hive.exec.submitviachild=true;
 set hive.exec.submit.local.task.via.child=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q b/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
index a272360..bbf33f9 100644
--- a/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
+++ b/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
@@ -1,5 +1,5 @@
 set hive.fetch.task.conversion=more;
-
+set hive.mapred.mode=nonstrict;
 explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10;
 explain select cast(key as int) * 10, upper(value) from src limit 10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/notable_alias1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/notable_alias1.q b/ql/src/test/queries/clientpositive/notable_alias1.q
index ed7e318..90230d5 100644
--- a/ql/src/test/queries/clientpositive/notable_alias1.q
+++ b/ql/src/test/queries/clientpositive/notable_alias1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(dummy STRING, key INT, value DOUBLE) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/notable_alias2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/notable_alias2.q b/ql/src/test/queries/clientpositive/notable_alias2.q
index b9c963c..2f32b32 100644
--- a/ql/src/test/queries/clientpositive/notable_alias2.q
+++ b/ql/src/test/queries/clientpositive/notable_alias2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(dummy STRING, key INT, value DOUBLE) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup.q b/ql/src/test/queries/clientpositive/nullgroup.q
index 5ec67e5..1e4cffc 100644
--- a/ql/src/test/queries/clientpositive/nullgroup.q
+++ b/ql/src/test/queries/clientpositive/nullgroup.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup2.q b/ql/src/test/queries/clientpositive/nullgroup2.q
index fecd6d4..bdee893 100644
--- a/ql/src/test/queries/clientpositive/nullgroup2.q
+++ b/ql/src/test/queries/clientpositive/nullgroup2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup3.q b/ql/src/test/queries/clientpositive/nullgroup3.q
index 19e5b10..282f6c3 100644
--- a/ql/src/test/queries/clientpositive/nullgroup3.q
+++ b/ql/src/test/queries/clientpositive/nullgroup3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE;
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09');
 LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08');

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup4.q b/ql/src/test/queries/clientpositive/nullgroup4.q
index 917d1a7..61b0f2c 100644
--- a/ql/src/test/queries/clientpositive/nullgroup4.q
+++ b/ql/src/test/queries/clientpositive/nullgroup4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q b/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q
index fcee629..500cb9e 100644
--- a/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/optimize_nullscan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/optimize_nullscan.q b/ql/src/test/queries/clientpositive/optimize_nullscan.q
index 89293c5..ac56275 100644
--- a/ql/src/test/queries/clientpositive/optimize_nullscan.q
+++ b/ql/src/test/queries/clientpositive/optimize_nullscan.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=false;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/optional_outer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/optional_outer.q b/ql/src/test/queries/clientpositive/optional_outer.q
index 10971ab..518e9c5 100644
--- a/ql/src/test/queries/clientpositive/optional_outer.q
+++ b/ql/src/test/queries/clientpositive/optional_outer.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 EXPLAIN SELECT * FROM src a LEFT OUTER JOIN src b on (a.key=b.key);
 EXPLAIN SELECT * FROM src a LEFT JOIN src b on (a.key=b.key);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_analyze.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_analyze.q b/ql/src/test/queries/clientpositive/orc_analyze.q
index bd22e6f..71903a2 100644
--- a/ql/src/test/queries/clientpositive/orc_analyze.q
+++ b/ql/src/test/queries/clientpositive/orc_analyze.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.exec.submitviachild=true;
 set hive.exec.submit.local.task.via.child=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_create.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_create.q b/ql/src/test/queries/clientpositive/orc_create.q
index e42c5ae..57912ef 100644
--- a/ql/src/test/queries/clientpositive/orc_create.q
+++ b/ql/src/test/queries/clientpositive/orc_create.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 DROP TABLE orc_create;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_createas1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_createas1.q b/ql/src/test/queries/clientpositive/orc_createas1.q
index 874d16c..b39d65d 100644
--- a/ql/src/test/queries/clientpositive/orc_createas1.q
+++ b/ql/src/test/queries/clientpositive/orc_createas1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set mapred.max.split.size=100;
 set mapred.min.split.size=1;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_diff_part_cols.q b/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
index 450f19e..3bfdf99 100644
--- a/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
+++ b/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE test_orc (key STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_file_dump.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_file_dump.q b/ql/src/test/queries/clientpositive/orc_file_dump.q
index ed0da75..3d4f1a9 100644
--- a/ql/src/test/queries/clientpositive/orc_file_dump.q
+++ b/ql/src/test/queries/clientpositive/orc_file_dump.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 CREATE TABLE staging(t tinyint,
            si smallint,
            i int,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_int_type_promotion.q b/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
index c3e2cf9..3dfed2b 100644
--- a/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
+++ b/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 create table if not exists alltypes (
  bo boolean,

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_llap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_llap.q b/ql/src/test/queries/clientpositive/orc_llap.q
index 4b2a3f7..d2bd086 100644
--- a/ql/src/test/queries/clientpositive/orc_llap.q
+++ b/ql/src/test/queries/clientpositive/orc_llap.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 
 SET hive.llap.io.enabled=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge1.q b/ql/src/test/queries/clientpositive/orc_merge1.q
index afef1e5..d0f0b28 100644
--- a/ql/src/test/queries/clientpositive/orc_merge1.q
+++ b/ql/src/test/queries/clientpositive/orc_merge1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge10.q b/ql/src/test/queries/clientpositive/orc_merge10.q
index 7f81947..98d3aa3 100644
--- a/ql/src/test/queries/clientpositive/orc_merge10.q
+++ b/ql/src/test/queries/clientpositive/orc_merge10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge2.q b/ql/src/test/queries/clientpositive/orc_merge2.q
index 6d229f1..667e878 100644
--- a/ql/src/test/queries/clientpositive/orc_merge2.q
+++ b/ql/src/test/queries/clientpositive/orc_merge2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=true;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge3.q b/ql/src/test/queries/clientpositive/orc_merge3.q
index f5600c6..d5230b1 100644
--- a/ql/src/test/queries/clientpositive/orc_merge3.q
+++ b/ql/src/test/queries/clientpositive/orc_merge3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=true;
 set hive.merge.sparkfiles=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge4.q b/ql/src/test/queries/clientpositive/orc_merge4.q
index 536e717..0f91641 100644
--- a/ql/src/test/queries/clientpositive/orc_merge4.q
+++ b/ql/src/test/queries/clientpositive/orc_merge4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q b/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
index a8ab7b8..1787f08 100644
--- a/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
+++ b/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=false;
 set hive.exec.dynamic.partition=true;

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