HIVE-6398 : MapRedTask.configureDebugVariablesForChildJVM mixes HIVE_CHILD_CLIENT_DEBUG_OPTS and HIVE_MAIN_CLIENT_DEBUG_OPTS in env check (Remus Rusanu via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1567806 13f79535-47bb-0310-9956-ffa450edef68
HIVE-6167 : Allow user-defined functions to be qualified with database name (Jason Dere via Ashutosh Chauhan)

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