This is an automated cherry-pick of pingcap#54043

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Jul 1, 2024 · 4a336f4 · 4a336f4
1 parent 1c5016d
commit 4a336f4
Show file tree

Hide file tree

Showing 2 changed files with 2,957 additions and 0 deletions.
diff --git a/executor/show.go b/executor/show.go
@@ -1833,7 +1833,15 @@ func (e *ShowExec) fetchShowWarnings(errOnly bool) error {
 			sqlErr := terror.ToSQLError(x)
 			e.appendRow([]interface{}{w.Level, int64(sqlErr.Code), sqlErr.Message})
 		default:
+<<<<<<< HEAD:executor/show.go
 			e.appendRow([]interface{}{w.Level, int64(mysql.ErrUnknown), warn.Error()})
+=======
+			var err string
+			if warn != nil {
+				err = warn.Error()
+			}
+			e.appendRow([]any{w.Level, int64(mysql.ErrUnknown), err})
+>>>>>>> 3c46a1e072c (*: panic guard for warnings (#54043)):pkg/executor/show.go
 		}
 	}
 	return nil