fix ut

infoschema/cluster_tables_test.go

@@ -854,14 +854,8 @@ func TestMDLView(t *testing.T) {
 }
 
 func TestCreateBindingForPrepareToken(t *testing.T) {
-	s := new(clusterTablesSuite)
-	s.store, s.dom = testkit.CreateMockStoreAndDomain(t)
-	s.rpcserver, s.listenAddr = s.setUpRPCService(t, "127.0.0.1:0", nil)
-	s.httpServer, s.mockAddr = s.setUpMockPDHTTPServer()
-	s.startTime = time.Now()
-	defer s.httpServer.Close()
-	defer s.rpcserver.Stop()
-	tk := s.newTestKitWithRoot(t)
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
 	require.NoError(t, tk.Session().Auth(&auth.UserIdentity{Username: "root", Hostname: "%"}, nil, nil))
 
 	tk.MustExec("use test")

util/stmtsummary/statement_summary.go

@@ -518,15 +518,10 @@ func getBindableStmtByPlanDigest(ssbd *stmtSummaryByDigest, planDigest string) *
 			}
 			// If it is SQL command prepare / execute, we should remove the arguments
 			// If it is binary protocol prepare / execute, ssbd.normalizedSQL should be same as ssElement.sampleSQL.
-<<<<<<< HEAD
 			if ssElement.prepared {
-				stmt.Query = ssbd.normalizedSQL
-=======
-			if row.GetInt64(4) == 1 {
 				if idx := strings.LastIndex(stmt.Query, "[arguments:"); idx != -1 {
 					stmt.Query = stmt.Query[:idx]
 				}
->>>>>>> 98fe813b49 (planner: fix space requirement when binding from history (#41140))
 			}
 			return stmt
 		}