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:52 UTC

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

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)