HIVE-6785 - query fails when partitioned table's table level serde is ParquetHiveSerDe and partition level serde is of different SerDe (Tongji via Brock)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1590452 13f79535-47bb-0310-9956-ffa450edef68
HIVE-6469: skipTrash option in hive command line (Jayesh via Xuefu)

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