[SPARK-10136] [SQL] A more robust fix for SPARK-10136#8361

liancheng wants to merge 2 commits intoapache:masterapache/spark:masterfrom

liancheng:spark-10136/proper-versionliancheng/spark:spark-10136/proper-versionCopy head branch name to clipboard