Merge 10.6 into 10.11

Author: dr-m

client/mysqltest.cc

@@ -2852,6 +2852,7 @@ do_result_format_version(struct st_command *command)
   dynstr_append_mem(&ds_res, ds_version.str, ds_version.length);
   dynstr_append_mem(&ds_res, STRING_WITH_LEN("\n"));
   dynstr_free(&ds_version);
+  DBUG_VOID_RETURN;
 }
 
 

mysql-test/main/long_unique_bugs.result

@@ -770,4 +770,42 @@ alter table t1 add constraint constraint_1 unique (a);
 Warnings:
 Note	1831	Duplicate index `constraint_1`. This is deprecated and will be disallowed in a future release
 drop table t1;
+#
+# MDEV-33675 assertion(reclength < vreclength) in setup_vcols_for_repair()
+#
+create table t (c1 bit, unique key(c1) using hash) engine=myisam;
+insert into t values (0);
+check table t;
+Table	Op	Msg_type	Msg_text
+test.t	check	status	OK
+insert into t values();
+select cast(c1 as unsigned) c1 from t;
+c1
+0
+NULL
+drop table t;
+create table t1 (c1 bit, c2 long as (c1) virtual, c3 char(10),
+c4 long as (c1) stored) engine=myisam;
+insert into t1 (c1, c3) values (1, "a");
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+insert into t1 values();
+select hex(c1), hex(c2), c3, hex(c4) from t1;
+hex(c1)	hex(c2)	c3	hex(c4)
+1	01	a	01
+NULL	NULL	NULL	NULL
+drop table t1;
+create table t1 (c1 bit, c2 long as (c1) virtual, c3 char(10),
+c4 long as (c1) stored) engine=aria;
+insert into t1 (c1, c3) values (1, "a");
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+insert into t1 values();
+select hex(c1), hex(c2), c3, hex(c4) from t1;
+hex(c1)	hex(c2)	c3	hex(c4)
+1	01	a	01
+NULL	NULL	NULL	NULL
+drop table t1;
 # End of 10.5 tests

mysql-test/main/long_unique_bugs.test

@@ -745,4 +745,30 @@ create table t1 (a blob unique);
 alter table t1 add constraint constraint_1 unique (a);
 drop table t1;
 
+--echo #
+--echo # MDEV-33675 assertion(reclength < vreclength) in setup_vcols_for_repair()
+--echo #
+create table t (c1 bit, unique key(c1) using hash) engine=myisam;
+insert into t values (0);
+check table t;
+insert into t values();
+select cast(c1 as unsigned) c1 from t;
+drop table t;
+
+create table t1 (c1 bit, c2 long as (c1) virtual, c3 char(10),
+                 c4 long as (c1) stored) engine=myisam;
+insert into t1 (c1, c3) values (1, "a");
+check table t1;
+insert into t1 values();
+select hex(c1), hex(c2), c3, hex(c4) from t1;
+drop table t1;
+
+create table t1 (c1 bit, c2 long as (c1) virtual, c3 char(10),
+                 c4 long as (c1) stored) engine=aria;
+insert into t1 (c1, c3) values (1, "a");
+check table t1;
+insert into t1 values();
+select hex(c1), hex(c2), c3, hex(c4) from t1;
+drop table t1;
+
 --echo # End of 10.5 tests

mysql-test/suite/galera/r/MDEV-29142.result

@@ -42,4 +42,8 @@ connection node_2;
 call mtr.add_suppression("WSREP: Failed to open table mysql\\.wsrep_streaming_log for writing");
 call mtr.add_suppression("WSREP: Failed to open SR table for write");
 call mtr.add_suppression("WSREP: Failed to recover SR transactions from schema: wsrep_on : 0");
+connection node_1;
+call mtr.add_suppression("WSREP: Cert position .* less than last committed");
+connection node_2;
+call mtr.add_suppression("WSREP: Cert position .* less than last committed");
 DROP TABLE IF EXISTS t1;