Merge 8.0 -> trunk

Author: blaudden

mysql-test/lib/My/ConfigFactory.pm

@@ -292,6 +292,15 @@ sub fix_rsa_public_key {
   return "$std_data/rsa_public_key.pem";
 }
 
+sub fix_bind_address {
+  my ($self) = @_;
+  if ($self->{ARGS}->{bind_local}) {
+    # Listen only for incoming network connections from local machine
+    return "localhost";
+  }
+  return undef;
+}
+
 # Rules to run for each mysqld in the config
 #  - some rules depend on each other and thus need to be run
 #    in the order listed here
@@ -308,9 +317,11 @@ my @mysqld_rules = (
   { 'datadir'                                      => \&fix_datadir },
   { 'port'                                         => \&fix_port },
   { 'admin-port'                                   => \&fix_admin_port },
+  { 'bind-address'                                 => \&fix_bind_address },
   { 'general_log'                                  => \&fix_general_log },
   { 'general_log_file'                             => \&fix_log },
   { 'loose-mysqlx-port'                            => \&fix_x_port },
+  { 'loose-mysqlx-bind-address'                    => \&fix_bind_address },
   { 'loose-mysqlx-socket'                          => \&fix_x_socket },
   { 'loose-mysqlx-ssl'                             => \&fix_ssl_disabled },
   { 'loose-mysqlx-ssl-ca'                          => "" },
@@ -754,7 +765,9 @@ sub new_config {
                            @ndb_mgmd_rules);
 
   $self->run_section_rules($config, 'ndb_mgmd.',
-    ({ 'cluster-config-suffix' => \&fix_cluster_config_suffix },));
+    ({ 'cluster-config-suffix' => \&fix_cluster_config_suffix },
+     { 'bind-address' => \&fix_bind_address },
+    ));
 
   $self->run_section_rules($config, 'cluster_config.ndbd', @ndbd_rules);
 

mysql-test/mysql-test-run.pl

@@ -149,6 +149,7 @@
 my $opt_mysqlx_baseport    = $ENV{'MYSQLXPLUGIN_PORT'} || "auto";
 my $opt_port_base          = $ENV{'MTR_PORT_BASE'} || "auto";
 my $opt_port_exclude       = $ENV{'MTR_PORT_EXCLUDE'} || "none";
+my $opt_bind_local         = $ENV{'MTR_BIND_LOCAL'};
 my $opt_reorder            = 1;
 my $opt_retry              = 3;
 my $opt_retry_failure      = env_or_val(MTR_RETRY_FAILURE => 2);
@@ -1677,6 +1678,7 @@ sub command_line_setup {
     'mysqlx-port=i'                   => \$opt_mysqlx_baseport,
     'port-base|mtr-port-base=i'       => \$opt_port_base,
     'port-exclude|mtr-port-exclude=s' => \$opt_port_exclude,
+    'bind-local!'                     => \$opt_bind_local,
 
     # Test case authoring
     'check-testcases!' => \$opt_check_testcases,
@@ -4218,6 +4220,7 @@ sub default_mysqld {
                                     baseport      => 0,
                                     user          => $opt_user,
                                     password      => '',
+                                    bind_local    => $opt_bind_local
                                   });
 
   my $mysqld = $config->group('mysqld.1') or
@@ -5018,6 +5021,7 @@ ($)
                            tmpdir              => $opt_tmpdir,
                            user                => $opt_user,
                            vardir              => $opt_vardir,
+                           bind_local          => $opt_bind_local
                          });
 
       # Write the new my.cnf
@@ -7951,6 +7955,11 @@ ($)
                         and is not "auto", it overrides build-thread.
   port-exclude=#-#      Specify the range of ports to exclude when searching
                         for available port ranges to use.
+  bind-local            Bind listening ports to localhost, i.e disallow
+                        "incoming network connections" which might cause
+                        firewall to display annoying popups.
+                        Can be set in environment variable MTR_BIND_LOCAL=1.
+                        To disable use --no-bind-local.
 
 Options for test case authoring