skip server engine test

Author: max-hoffman

enginetest/join_planning_tests.go

@@ -1760,6 +1760,11 @@ func TestJoinPlanning(t *testing.T, harness Harness) {
 func runJoinPlanningTests(t *testing.T, harness Harness, tests []joinPlanScript) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			if sh, ok := harness.(SkippingHarness); ok {
+				if sh.SkipQueryTest(tt.name) {
+					t.Skip(tt.name)
+				}
+			}
 			harness.Setup([]setup.SetupScript{setup.MydbData[0], tt.setup})
 			e := mustNewEngine(t, harness)
 			defer e.Close()

enginetest/memory_engine_test.go

@@ -111,7 +111,11 @@ func TestLateralJoin(t *testing.T) {
 
 // TestJoinPlanning runs join-specific tests for merge
 func TestJoinPlanning(t *testing.T) {
-	enginetest.TestJoinPlanning(t, enginetest.NewDefaultMemoryHarness())
+	harness := enginetest.NewDefaultMemoryHarness()
+	if harness.IsUsingServer() {
+		harness.QueriesToSkip("block merge join")
+	}
+	enginetest.TestJoinPlanning(t, harness)
 }
 
 // TestJoinOps runs join-specific tests for merge