Cherry-pick eb22cfb with conflicts

vitessio · May 13, 2024 · e52f681 · e52f681
1 parent 61ece6f
commit e52f681
Show file tree

Hide file tree

Showing 2 changed files with 186 additions and 136 deletions.
diff --git a/.gitignore b/.gitignore
@@ -86,3 +86,10 @@ report
 
 # plan test output
 /go/vt/vtgate/planbuilder/testdata/plan_test*
+<<<<<<< HEAD
+=======
+/go/vt/vtgate/planbuilder/testdata/expected
+
+# mise files
+.mise.toml
+>>>>>>> eb22cfb0db (test: Cleaner plan tests output (#15922))