*: fix empty SQL in slow log for internal statement (#54274) (#54309)

close #52743, close #53264, close #54190
pingcap · Jul 30, 2024 · b5de417 · b5de417
1 parent 4e373cf
commit b5de417
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/pkg/sessionctx/variable/session.go b/pkg/sessionctx/variable/session.go
@@ -2045,6 +2045,7 @@ func NewSessionVars(hctx HookContext) *SessionVars {
 		ResourceGroupName:             resourcegroup.DefaultResourceGroupName,
 		DefaultCollationForUTF8MB4:    mysql.DefaultCollationName,
 		GroupConcatMaxLen:             DefGroupConcatMaxLen,
+		EnableRedactLog:               DefTiDBRedactLog,
 	}
 	vars.status.Store(uint32(mysql.ServerStatusAutocommit))
 	vars.StmtCtx.ResourceGroupName = resourcegroup.DefaultResourceGroupName

diff --git a/pkg/util/redact/BUILD.bazel b/pkg/util/redact/BUILD.bazel
@@ -5,7 +5,10 @@ go_library(
     srcs = ["redact.go"],
     importpath = "github.com/pingcap/tidb/pkg/util/redact",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_pingcap_errors//:errors"],
+    deps = [
+        "//pkg/util/intest",
+        "@com_github_pingcap_errors//:errors",
+    ],
 )
 
 go_test(

diff --git a/pkg/util/redact/redact.go b/pkg/util/redact/redact.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 
 	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/pkg/util/intest"
 )
 
 var (
@@ -50,7 +51,11 @@ func String(mode string, input string) string {
 		return b.String()
 	case "OFF":
 		return input
+	case "ON":
+		return ""
 	default:
+		// should never happen
+		intest.Assert(false, "invalid redact mode")
 		return ""
 	}
 }