Merge 10.6 into 10.11

mysql-test/suite/versioning/r/partition.result

@@ -3459,6 +3459,15 @@ insert into t values (1),(2);
 DELETE from t;
 drop table t;
 #
+# MDEV-36817 Server crashes in do_mark_index_columns instead of
+#            ER_DUP_ENTRY on partitioned table
+#
+create table t (f int, unique(f)) engine=innodb partition by key (f) partitions 2;
+insert into t (f) values (1), (3);
+update t set f = 0;
+ERROR 23000: Duplicate entry '0' for key 'f'
+drop table t;
+#
 # End of 10.5 tests
 #
 #