HIVE-9099: infer_bucket_sort_convert_join.q and mapjoin_hook.q failed.[Spark Branch]infer_bucket_sort_convert_join.q and mapjoin_hook.q failed.[Spark Branch]

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1645765 13f79535-47bb-0310-9956-ffa450edef68