HIVE-8619: CBO causes some more type problems (Laljo John Pullokkaran via Gunther Hagleitner)

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