diff --git conf/hive-default.xml.template conf/hive-default.xml.template
index 653f5cc..ba922d0 100644
--- conf/hive-default.xml.template
+++ conf/hive-default.xml.template
@@ -1711,6 +1711,11 @@
+ hive.optimize.null.scan
+ true
+ Dont scan relations which are guaranteed to not generate any rows
+
+
hive.optimize.ppd.storage
true
Whether to push predicates down to storage handlers
diff --git ql/src/test/results/clientnegative/authorization_fail_8.q.out ql/src/test/results/clientnegative/authorization_fail_8.q.out
index 10dd71b..fecb15c 100644
--- ql/src/test/results/clientnegative/authorization_fail_8.q.out
+++ ql/src/test/results/clientnegative/authorization_fail_8.q.out
@@ -45,4 +45,4 @@ PREHOOK: query: -- Now that grant option has been revoked, granting to other use
GRANT SELECT ON authorization_fail TO USER user3
PREHOOK: type: GRANT_PRIVILEGE
PREHOOK: Output: default@authorization_fail
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Permission denied. Principal [name=user2, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.authorization_fail] : [SELECT with grant]
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Permission denied. Principal [name=user2, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.authorization_fail] for operation GRANT_PRIVILEGE : [SELECT with grant]