Merge 11.4 into 11.8

Author: dr-m

mysql-test/main/information_schema_db.result

@@ -213,11 +213,8 @@ connection default;
 use test;
 drop view testdb_1.v1, v2, testdb_1.v3, v4;
 drop database testdb_1;
-connection testdb_1;
 disconnect testdb_1;
-connection testdb_2;
 disconnect testdb_2;
-connection default;
 drop user testdb_1@localhost;
 drop user testdb_2@localhost;
 #
@@ -249,18 +246,18 @@ ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `
 connection default;
 drop user mysqltest_1@localhost;
 drop database testdb_1;
-connection user1;
 disconnect user1;
-connection default;
 set global sql_mode=default;
 #
 # MDEV-20549 SQL SECURITY DEFINER does not work for INFORMATION_SCHEMA tables
 #
 create user foo@localhost;
 grant select on test.* to foo@localhost;
+connect foo,localhost,foo;
+connection default;
 create procedure rootonly() select 1;
-create sql security definer view v1d as select current_user(),user from information_schema.processlist where command!='daemon';
-create sql security invoker view v1i as select current_user(),user from information_schema.processlist where command!='daemon';
+create sql security definer view v1d as select current_user(),user from information_schema.processlist where id in($default_id, $foo_id) order by user;
+create sql security invoker view v1i as select current_user(),user from information_schema.processlist where id in($default_id, $foo_id) order by user;
 create sql security definer view v2d as select table_name from information_schema.tables where table_schema='mysql' and table_name like '%user%';
 create sql security invoker view v2i as select table_name from information_schema.tables where table_schema='mysql' and table_name like '%user%';
 create sql security definer view v3d as select schema_name from information_schema.schemata where schema_name like '%mysql%';
@@ -269,7 +266,7 @@ create sql security definer view v4d as select routine_name from information_sch
 create sql security invoker view v4i as select routine_name from information_schema.routines where routine_schema='test';
 create sql security definer view v5d as select view_definition > '' from information_schema.views where table_name='v1d';
 create sql security invoker view v5i as select view_definition > '' from information_schema.views where table_name='v1d';
-connect foo,localhost,foo;
+connection foo;
 select * from v1d;
 current_user()	user
 root@localhost	root

mysql-test/main/information_schema_db.test

@@ -207,13 +207,8 @@ connection default;
 use test;
 drop view testdb_1.v1, v2, testdb_1.v3, v4;
 drop database testdb_1;
-connection testdb_1;
 disconnect testdb_1;
---source include/wait_until_disconnected.inc
-connection testdb_2;
 disconnect testdb_2;
---source include/wait_until_disconnected.inc
-connection default;
 drop user testdb_1@localhost;
 drop user testdb_2@localhost;
 
@@ -244,10 +239,7 @@ show create view testdb_1.v1;
 connection default;
 drop user mysqltest_1@localhost;
 drop database testdb_1;
-connection user1;
 disconnect user1;
---source include/wait_until_disconnected.inc
-connection default;
 
 set global sql_mode=default;
 
@@ -257,9 +249,13 @@ set global sql_mode=default;
 
 create user foo@localhost;
 grant select on test.* to foo@localhost;
+let $default_id= `select connection_id()`;
+connect foo,localhost,foo;
+let $foo_id= `select connection_id()`;
+connection default;
 create procedure rootonly() select 1;
-create sql security definer view v1d as select current_user(),user from information_schema.processlist where command!='daemon';
-create sql security invoker view v1i as select current_user(),user from information_schema.processlist where command!='daemon';
+evalp create sql security definer view v1d as select current_user(),user from information_schema.processlist where id in($default_id, $foo_id) order by user;
+evalp create sql security invoker view v1i as select current_user(),user from information_schema.processlist where id in($default_id, $foo_id) order by user;
 create sql security definer view v2d as select table_name from information_schema.tables where table_schema='mysql' and table_name like '%user%';
 create sql security invoker view v2i as select table_name from information_schema.tables where table_schema='mysql' and table_name like '%user%';
 create sql security definer view v3d as select schema_name from information_schema.schemata where schema_name like '%mysql%';
@@ -268,7 +264,7 @@ create sql security definer view v4d as select routine_name from information_sch
 create sql security invoker view v4i as select routine_name from information_schema.routines where routine_schema='test';
 create sql security definer view v5d as select view_definition > '' from information_schema.views where table_name='v1d';
 create sql security invoker view v5i as select view_definition > '' from information_schema.views where table_name='v1d';
-connect foo,localhost,foo;
+connection foo;
 select * from v1d;
 select * from v1i;
 select * from v2d;

mysql-test/main/limit_rows_examined.result

@@ -932,3 +932,14 @@ Warnings:
 Warning	1931	Query execution was interrupted. The query exceeded LIMIT ROWS EXAMINED 100. The query result may be incomplete
 DROP TABLE t1, t2;
 # End of 10.5 tests
+#
+# MDEV-22241: Assertion `0' failed in Protocol::end_statement after query with LIMIT ROWS EXAMINED
+#
+CREATE TABLE t1 (a int);
+INSERT INTO t1 VALUES (1);
+SELECT 1 FROM t1
+WHERE (1 IN (SELECT 8 UNION SELECT 5)) OR t1.a = 2
+LIMIT ROWS EXAMINED 1;
+1
+DROP TABLE t1;
+# End of 10.11 tests

mysql-test/main/limit_rows_examined.test

@@ -658,3 +658,18 @@ SELECT COUNT(*) FROM t1 JOIN t2 ON (b = a) UNION DISTINCT SELECT COUNT(*) FROM t
 DROP TABLE t1, t2;
 
 --echo # End of 10.5 tests
+
+--echo #
+--echo # MDEV-22241: Assertion `0' failed in Protocol::end_statement after query with LIMIT ROWS EXAMINED
+--echo #
+
+CREATE TABLE t1 (a int);
+INSERT INTO t1 VALUES (1);
+
+SELECT 1 FROM t1
+WHERE (1 IN (SELECT 8 UNION SELECT 5)) OR t1.a = 2
+LIMIT ROWS EXAMINED 1;
+
+DROP TABLE t1;
+
+--echo # End of 10.11 tests

mysql-test/suite/encryption/r/recovery_memory.result

@@ -1,3 +1,5 @@
+SET GLOBAL innodb_encrypt_tables=ON,innodb_encryption_threads=1;
+SET GLOBAL innodb_saved_page_number_debug=4,innodb_fil_make_page_dirty_debug=0;
 CREATE TABLE t1(f1 text, index idx(f1(20))) ENGINE INNODB;
 set global innodb_fast_shutdown=0;
 # restart: --debug_dbug=+d,ib_log_checkpoint_avoid_hard --innodb_flush_sync=0

mysql-test/suite/encryption/t/recovery_memory.combinations

@@ -0,0 +1,4 @@
+[full_crc32]
+--innodb-checksum-algorithm=full_crc32
+[crc32]
+--innodb-checksum-algorithm=crc32

mysql-test/suite/encryption/t/recovery_memory.test

@@ -5,6 +5,9 @@
 
 let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
 let MYSQLD_DATADIR=`select @@datadir`;
+# Encrypt the change buffer root page
+SET GLOBAL innodb_encrypt_tables=ON,innodb_encryption_threads=1;
+SET GLOBAL innodb_saved_page_number_debug=4,innodb_fil_make_page_dirty_debug=0;
 
 CREATE TABLE t1(f1 text, index idx(f1(20))) ENGINE INNODB;
 

mysql-test/suite/galera/disabled.def

@@ -12,7 +12,6 @@
 
 galera_wan : MDEV-35940 Unallowed state transition: donor -> synced in galera_wan
 galera_vote_rejoin_ddl : MDEV-35940 Unallowed state transition: donor -> synced in galera_wan
-MW-329 : MDEV-35951 Complete freeze during MW-329 test
 galera_vote_rejoin_dml : MDEV-35964 Assertion `ist_seqno >= cc_seqno' failed in galera_vote_rejoin_dml
 galera_var_notify_cmd : MDEV-37257 WSREP: Notification command failed: 1 (Operation not permitted)
 galera_var_notify_ssl_ipv6 : MDEV-37257 WSREP: Notification command failed: 1 (Operation not permitted)

mysql-test/suite/galera/r/MW-329.result

@@ -14,10 +14,11 @@ END|
 connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 connection node_1b;
 connection node_1;
+connect node_1c, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connection node_1c;
 connection node_1b;
 connection node_1;
 DROP PROCEDURE proc_insert;
 DROP TABLE t1;
 disconnect node_1b;
-CALL mtr.add_suppression("WSREP: .* conflict state after post commit ");
-set global innodb_status_output=Default;
+disconnect node_1c;