[SPARK-11191] [SPARK-11311] [SQL] Backports #9664 and #9277 to branch-1.5#9671

liancheng wants to merge 2 commits intoapache:branch-1.5apache/spark:branch-1.5from

liancheng:spark-11191.fix-temp-function.branch-1_5liancheng/spark:spark-11191.fix-temp-function.branch-1_5Copy head branch name to clipboard