Minor touchup

sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala

@@ -156,7 +156,7 @@ abstract class SparkPlan extends QueryPlan[SparkPlan] with Logging with Serializ
    * Produces the result of the query as a broadcast variable.
    */
   protected[sql] def doExecuteBroadcast[T](): broadcast.Broadcast[T] = {
-    throw new NotImplementedError(s"$nodeName does not implement doExecuteBroadcast:\n$this")
+    throw new NotImplementedError(s"$nodeName does not implement doExecuteBroadcast")
   }
 
   /**

sql/core/src/test/scala/org/apache/spark/sql/execution/joins/InnerJoinSuite.scala

@@ -31,7 +31,6 @@ class InnerJoinSuite extends SparkPlanTest with SharedSQLContext {
 
   override def beforeAll(): Unit = {
     super.beforeAll()
-    sqlContext.setConf("spark.sql.codegen.wholeStage", "false")
   }
 
   private lazy val myUpperCaseData = sqlContext.createDataFrame(