session: check redact when log compile error (#41832) (#41924)

close #41831
pingcap · Jun 29, 2023 · bd94fb8 · bd94fb8
1 parent 2a463d7
commit bd94fb8
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/session/session.go b/session/session.go
@@ -1959,7 +1959,14 @@ func (s *session) ExecuteStmt(ctx context.Context, stmtNode ast.StmtNode) (sqlex
 		// Only print log message when this SQL is from the user.
 		// Mute the warning for internal SQLs.
 		if !s.sessionVars.InRestrictedSQL {
-			logutil.Logger(ctx).Warn("compile SQL failed", zap.Error(err), zap.String("SQL", stmtNode.Text()))
+			if !variable.ErrUnknownSystemVar.Equal(err) {
+				sql := stmtNode.Text()
+				if s.sessionVars.EnableRedactLog {
+					sql = parser.Normalize(sql)
+				}
+				logutil.Logger(ctx).Warn("compile SQL failed", zap.Error(err),
+					zap.String("SQL", sql))
+			}
 		}
 		return nil, err
 	}