This is an automated cherry-pick of pingcap#55814

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Sep 6, 2024 · 16f1f9b · 16f1f9b
1 parent 973b215
commit 16f1f9b
Show file tree

Hide file tree

Showing 3 changed files with 775 additions and 1 deletion.
diff --git a/executor/infoschema_reader.go b/executor/infoschema_reader.go
@@ -587,6 +587,11 @@ func (e *memtableRetriever) setDataForStatisticsInTable(schema *model.DBInfo, ta
 				expression = tblCol.GeneratedExprString
 			}
 
+			var subPart any
+			if key.Length != types.UnspecifiedLength {
+				subPart = key.Length
+			}
+
 			record := types.MakeDatums(
 				infoschema.CatalogVal, // TABLE_CATALOG
 				schema.Name.O,         // TABLE_SCHEMA
@@ -598,7 +603,7 @@ func (e *memtableRetriever) setDataForStatisticsInTable(schema *model.DBInfo, ta
 				colName,               // COLUMN_NAME
 				"A",                   // COLLATION
 				0,                     // CARDINALITY
-				nil,                   // SUB_PART
+				subPart,               // SUB_PART
 				nil,                   // PACKED
 				nullable,              // NULLABLE
 				"BTREE",               // INDEX_TYPE