Merge of patch for MDEV#6399.

mysql-test/lib/My/ConfigFactory.pm

@@ -238,6 +238,9 @@ my @mysqld_rules=
  { 'pid-file' => \&fix_pidfile },
  { '#host' => \&fix_host },
  { 'port' => \&fix_port },
+ # galera base_port and port used during SST
+ { '#galera_port' => \&fix_port },
+ { '#sst_port' => \&fix_port },
  { 'socket' => \&fix_socket },
  { '#log-error' => \&fix_log_error },
  { 'general-log' => 1 },

mysql-test/mysql-test-run.pl

@@ -3224,8 +3224,7 @@ sub check_wsrep_support() {
     if ((check_wsrep_provider_env() == 1) || ($file_wsrep_provider ne "")) {
       # Add galera test suites
       mtr_report(" - adding wsrep, galera to default test suites");
-      #push @DEFAULT_SUITES, qw(wsrep galera);
-      push @DEFAULT_SUITES, qw(wsrep);
+      push @DEFAULT_SUITES, qw(wsrep galera);
     }
   }
 }
@@ -4895,6 +4894,7 @@ sub extract_warning_lines ($$) {
      # Galera-related warnings.
      qr|WSREP:.*down context.*|,
      qr|WSREP: Failed to send state UUID:.*|,
+     qr|WSREP: wsrep_sst_receive_address.*|,
     );
 
   my $matched_lines= [];

mysql-test/suite/galera/galera_2nodes.cnf

@@ -5,12 +5,15 @@
 binlog-format=row
 wsrep_provider=@ENV.WSREP_PROVIDER
 wsrep_cluster_address='gcomm://'
+wsrep_provider_options='base_port=@mysqld.1.#galera_port'
+wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
 
 [mysqld.2]
 binlog-format=row
 wsrep_provider=@ENV.WSREP_PROVIDER
-wsrep_cluster_address='gcomm://127.0.0.1:4567'
-wsrep_provider_options='gmcast.listen_addr=tcp://127.0.0.1:4568'
+wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
+wsrep_provider_options='base_port=@mysqld.2.#galera_port'
+wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
 
 [ENV]
 NODE_MYPORT_1= @mysqld.1.port

mysql-test/suite/wsrep/my.cnf

+# Use default setting for mysqld processes
+!include include/default_mysqld.cnf
+
+[mysqld.1]
+
+[ENV]
+GALERA_BASE_PORT=@mysqld.1.#galera_port
+

mysql-test/suite/wsrep/t/binlog_format.opt

---binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 --log-bin
+--binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep_provider_options='base_port=$GALERA_BASE_PORT' --wsrep-on=1 --log-bin

mysql-test/suite/wsrep/t/foreign_key.opt

---binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm://
+--binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep_provider_options='base_port=$GALERA_BASE_PORT'

mysql-test/suite/wsrep/t/pool_of_threads.opt

---binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --thread_handling=pool-of-threads
+--binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep_provider_options='base_port=$GALERA_BASE_PORT' --thread_handling=pool-of-threads

mysql-test/suite/wsrep/t/variables.test

 --source include/have_wsrep.inc
 
+# Set galera's base_port so that test can run in parallel with other galera
+# tests.
+--disable_query_log
+eval SET GLOBAL wsrep_provider_options='base_port=$GALERA_BASE_PORT';
+--enable_query_log
+
 --echo
 --echo # MDEV#5534: mysql_tzinfo_to_sql generates wrong query
 --echo #