Merge 10.4 into 10.5

mysql-test/main/lowercase_table5.result

@@ -11,3 +11,39 @@ Database	Create Database
 mysql_TEST	CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci */
 DROP DATABASE mysql_test;
 DROP DATABASE mysql_TEST;
+#
+# Start of 10.4 tests
+#
+#
+# MDEV-33019 The database part is not case sensitive in SP names
+#
+CREATE DATABASE DB1;
+CREATE DATABASE db1;
+CREATE PROCEDURE DB1.sp() SELECT 'This is DB1.sp' AS ret;
+CREATE PROCEDURE db1.sp() SELECT 'This is db1.sp' AS ret;
+CALL DB1.sp();
+ret
+This is DB1.sp
+CALL db1.sp();
+ret
+This is db1.sp
+DROP DATABASE DB1;
+CALL DB1.sp();
+ERROR 42000: PROCEDURE DB1.sp does not exist
+CALL db1.sp();
+ret
+This is db1.sp
+DROP DATABASE db1;
+CREATE PROCEDURE SP() SELECT 'This is SP' AS ret;
+CREATE PROCEDURE sp() SELECT 'This is sp' AS ret;
+ERROR 42000: PROCEDURE sp already exists
+CALL SP();
+ret
+This is SP
+CALL sp();
+ret
+This is SP
+DROP PROCEDURE SP;
+#
+# End of 10.4 tests
+#

mysql-test/main/lowercase_table5.test

@@ -18,3 +18,34 @@ DROP DATABASE mysql_test;
 DROP DATABASE mysql_TEST;
 
 # End of 10.0 tests
+
+--echo #
+--echo # Start of 10.4 tests
+--echo #
+
+--echo #
+--echo # MDEV-33019 The database part is not case sensitive in SP names
+--echo #
+
+CREATE DATABASE DB1;
+CREATE DATABASE db1;
+CREATE PROCEDURE DB1.sp() SELECT 'This is DB1.sp' AS ret;
+CREATE PROCEDURE db1.sp() SELECT 'This is db1.sp' AS ret;
+CALL DB1.sp();
+CALL db1.sp();
+DROP DATABASE DB1;
+--error ER_SP_DOES_NOT_EXIST
+CALL DB1.sp();
+CALL db1.sp();
+DROP DATABASE db1;
+
+CREATE PROCEDURE SP() SELECT 'This is SP' AS ret;
+--error ER_SP_ALREADY_EXISTS
+CREATE PROCEDURE sp() SELECT 'This is sp' AS ret;
+CALL SP();
+CALL sp();
+DROP PROCEDURE SP;
+
+--echo #
+--echo # End of 10.4 tests
+--echo #

mysql-test/main/subselect4.result

@@ -3217,4 +3217,83 @@ FROM x
 )
 );
 ERROR 21000: Operand should contain 2 column(s)
+#
+# MDEV-29362: Constant subquery used as left part of IN subquery
+#
+CREATE TABLE t1 (a int) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (15), (1), (2);
+CREATE TABLE t2 (b int) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (15), (1);
+CREATE TABLE t3 (c int) ENGINE=MyISAM;
+INSERT INTO t3 VALUES (15), (1);
+SET optimizer_switch='condition_pushdown_from_having=off';
+SELECT a FROM t1 GROUP BY a
+HAVING a = ( (SELECT b FROM t2 where b=1) IN (SELECT c FROM t3)  ) + 1;
+a
+2
+SELECT a FROM t1 GROUP BY a
+HAVING a IN ( (SELECT b FROM t2 where b=1) IN (SELECT c FROM t3)  );
+a
+1
+SET optimizer_switch='condition_pushdown_from_having=on';
+SELECT a FROM t1 GROUP BY a
+HAVING a = ( (SELECT b FROM t2 where b=1) IN (SELECT c FROM t3)  ) + 1;
+a
+2
+SELECT a FROM t1 GROUP BY a
+HAVING a IN ( (SELECT b FROM t2 where b=1) IN (SELECT c FROM t3)  );
+a
+1
+EXPLAIN FORMAT=JSON SELECT a FROM t1 GROUP BY a
+HAVING a = ( (SELECT b FROM t2 where b=1) IN (SELECT c FROM t3)  ) + 1;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "table": {
+      "table_name": "t1",
+      "access_type": "ALL",
+      "rows": 3,
+      "filtered": 100,
+      "attached_condition": "t1.a = <cache>((<in_optimizer>((subquery#2),<exists>(subquery#3))) + 1)"
+    },
+    "subqueries": [
+      {
+        "query_block": {
+          "select_id": 3,
+          "having_condition": "trigcond(t3.c is null)",
+          "table": {
+            "table_name": "t3",
+            "access_type": "ALL",
+            "rows": 2,
+            "filtered": 100,
+            "attached_condition": "trigcond(1 = t3.c or t3.c is null)"
+          }
+        }
+      },
+      {
+        "query_block": {
+          "select_id": 2,
+          "table": {
+            "table_name": "t2",
+            "access_type": "ALL",
+            "rows": 2,
+            "filtered": 100,
+            "attached_condition": "t2.b = 1"
+          }
+        }
+      }
+    ]
+  }
+}
+PREPARE stmt FROM "SELECT a FROM t1 GROUP BY a
+HAVING a = ( (SELECT b FROM t2 where b=1) IN (SELECT c FROM t3)  ) + 1";
+EXECUTE stmt;
+a
+2
+EXECUTE stmt;
+a
+2
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1,t2,t3;
 # End of 10.4 tests

mysql-test/main/subselect4.test

@@ -2631,5 +2631,41 @@ SELECT
          )
   );
 
+--echo #
+--echo # MDEV-29362: Constant subquery used as left part of IN subquery
+--echo #
+
+CREATE TABLE t1 (a int) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (15), (1), (2);
+CREATE TABLE t2 (b int) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (15), (1);
+CREATE TABLE t3 (c int) ENGINE=MyISAM;
+INSERT INTO t3 VALUES (15), (1);
+
+let $q1=
+SELECT a FROM t1 GROUP BY a
+  HAVING a = ( (SELECT b FROM t2 where b=1) IN (SELECT c FROM t3)  ) + 1;
+let $q2=
+SELECT a FROM t1 GROUP BY a
+  HAVING a IN ( (SELECT b FROM t2 where b=1) IN (SELECT c FROM t3)  );
+
+SET optimizer_switch='condition_pushdown_from_having=off';
+
+eval $q1;
+eval $q2;
+
+SET optimizer_switch='condition_pushdown_from_having=on';
+
+eval $q1;
+eval $q2;
+
+eval EXPLAIN FORMAT=JSON $q1;
+
+eval PREPARE stmt FROM "$q1";
+EXECUTE stmt;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+DROP TABLE t1,t2,t3;
 
 --echo # End of 10.4 tests

mysql-test/suite/galera/disabled.def

@@ -12,8 +12,6 @@
 
 galera_as_slave_ctas : MDEV-28378 timeout
 galera_pc_recovery : MDEV-25199 cluster fails to start up
-galera_sst_encrypted : MDEV-29876 Galera test failure on galera_sst_encrypted
-galera_var_node_address : MDEV-20485 Galera test failure
 galera_sequences : MDEV-32561 WSREP FSM failure: no such a transition REPLICATING -> COMMITTED
 galera_shutdown_nonprim : MDEV-32635 galera_shutdown_nonprim: mysql_shutdown failed
 versioning_trx_id : MDEV-18590 : galera.versioning_trx_id: Test failure: mysqltest: Result content mismatch
@@ -23,5 +21,6 @@ galera_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep:
 galera_sst_mysqldump_with_key : MDEV-32782 galera_sst_mysqldump_with_key test failed
 mdev-31285 : MDEV-25089 Assertion `error.len > 0' failed in galera::ReplicatorSMM::handle_apply_error()
 galera_var_ignore_apply_errors : MENT-1997 galera_var_ignore_apply_errors test freezes
+MDEV-22232 : temporarily disabled at the request of Codership
 MW-402 : temporarily disabled at the request of Codership
 galera_desync_overlapped : MDEV-21538 galera_desync_overlapped MTR failed: Result content mismatch

mysql-test/suite/galera/suite.pm

@@ -71,13 +71,17 @@ push @::global_suppressions,
 sub which($) { return `sh -c "command -v $_[0]"` }
 
 sub skip_combinations {
-  my %skip = ();
+  my @combinations;
+
   $skip{'include/have_mariabackup.inc'} = 'Need socket statistics utility'
             unless which("lsof") || which("sockstat") || which("ss");
   $skip{'include/have_stunnel.inc'} = "Need 'stunnel' utility"
             unless which("stunnel");
   $skip{'include/have_qpress.inc'} = "Need 'qpress' utility"
             unless which("qpress");
+  $skip{'../encryption/include/have_file_key_management_plugin.combinations'} = [ 'ctr' ]
+    unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
+       and $1 ge "1.0.1";
   %skip;
 }
 

mysql-test/suite/galera/t/MDEV-27862.test

@@ -1,6 +1,8 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+--disable_ps2_protocol
+
 # NEXTVAL
 
 --connection node_1
@@ -54,3 +56,4 @@ SELECT NEXTVAL(seq_transaction) = 4;
 DROP SEQUENCE seq_transaction;
 DROP TABLE t1;
 
+--enable_ps2_protocol

mysql-test/suite/galera/t/galera_log_output_csv.test

@@ -12,13 +12,17 @@ INSERT INTO t1 VALUES (1);
 
 SELECT COUNT(*) > 0 FROM mysql.general_log;
 
+--disable_ps2_protocol
 SELECT 1 = 1 FROM t1;
 SELECT COUNT(*) = 1 FROM mysql.slow_log WHERE sql_text = 'SELECT 1 = 1 FROM t1';
+--enable_ps2_protocol
 
 --connection node_2
 
+--disable_ps2_protocol
 SELECT 2 = 2 FROM t1;
 SELECT COUNT(*) = 1 FROM mysql.slow_log WHERE sql_text = 'SELECT 2 = 2 FROM t1';
+--enable_ps2_protocol
 
 --connection node_1
 DROP TABLE t1;

mysql-test/suite/galera/t/galera_query_cache.test

@@ -2,6 +2,8 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+--disable_ps2_protocol
+
 #
 # Ensure that the query cache behaves properly with respect to Galera
 #
@@ -65,3 +67,4 @@ SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_
 
 DROP TABLE t1;
 
+--enable_ps2_protocol

mysql-test/suite/galera/t/galera_query_cache_sync_wait.test

@@ -4,6 +4,8 @@
 --source include/have_query_cache.inc
 --source include/galera_have_debug_sync.inc
 
+--disable_ps2_protocol
+
 CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 
@@ -88,3 +90,5 @@ DROP TABLE t1;
 
 --connection node_2a
 SET DEBUG_SYNC = "RESET";
+
+--enable_ps2_protocol

mysql-test/suite/galera/r/galera_var_node_address.result → mysql-test/suite/galera_3nodes/r/galera_var_node_address.result

@@ -1,22 +1,22 @@
 connection node_2;
 connection node_1;
-call  mtr.add_suppression("WSREP: Stray state UUID msg: .*");
-call  mtr.add_suppression("WSREP: Protocol violation. JOIN message sender .*");
-call  mtr.add_suppression("WSREP: Sending JOIN failed: .*");
-flush tables;
+connection node_1;
 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE
-4
-connection node_1;
+3
 CREATE TABLE t1 (f1 INTEGER) ENGINE=INNODB;
 connection node_2;
-set global wsrep_sync_wait=15;
 INSERT INTO t1 VALUES (1);
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
+1
 connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 connection node_3;
-set global wsrep_sync_wait=15;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 connection node_1;
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
+1
 DROP TABLE t1;

mysql-test/suite/galera/t/galera_var_node_address.cnf → mysql-test/suite/galera_3nodes/t/galera_var_node_address.cnf

@@ -1,10 +1,8 @@
-!include ../galera_4nodes.cnf
+!include ../galera_3nodes.cnf
 
 [mysqld.2]
 wsrep_node_address=127.0.0.1
 
 [mysqld.3]
 wsrep_node_address=localhost
 
-[mysqld.4]
-wsrep_node_address=lo

mysql-test/suite/galera/t/galera_var_node_address.test → mysql-test/suite/galera_3nodes/t/galera_var_node_address.test

@@ -6,27 +6,27 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
-call  mtr.add_suppression("WSREP: Stray state UUID msg: .*");
-call  mtr.add_suppression("WSREP: Protocol violation. JOIN message sender .*");
-call  mtr.add_suppression("WSREP: Sending JOIN failed: .*");
-flush tables;
-
---let $wait_condition = SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+--connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 --source include/wait_condition.inc
 
 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
---connection node_1
 CREATE TABLE t1 (f1 INTEGER) ENGINE=INNODB;
 
 --connection node_2
-set global wsrep_sync_wait=15;
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
+
 INSERT INTO t1 VALUES (1);
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
 
 --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
 --connection node_3
-set global wsrep_sync_wait=15;
-SELECT COUNT(*) FROM t1;
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
 
 --connection node_1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
 DROP TABLE t1;

mysql-test/suite/galera_3nodes_sr/disabled.def

@@ -9,5 +9,3 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-
-galera_sr_kill_slave_after_apply_rollback2 : MDEV-29892 Galera test failure on galera_sr_kill_slave_after_apply_rollback2