From 75a36b8bb3baadf7efd8834bd74ed6d507c458db Mon Sep 17 00:00:00 2001
From: Axel Svensson <axel@hopsworks.ai>
Date: Tue, 27 Aug 2024 09:02:00 +0200
Subject: [PATCH] [RONDB-734] MTR fixes

- Fix several regular expressions where a period matches any one
  character but a literal period was intended.
- Fix spelling.
---
 mysql-test/lib/My/ConfigFactory.pm | 20 ++++++++++----------
 mysql-test/mysql-test-run.pl       | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
index 014129a2dc0b..a611687b41e4 100644
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -485,7 +485,7 @@ sub post_check_client_group {
 sub post_check_client_groups {
   my ($self, $config) = @_;
 
-  my $first_mysqld = $config->first_like('mysqld.');
+  my $first_mysqld = $config->first_like('mysqld\.');
 
   return unless $first_mysqld;
 
@@ -494,7 +494,7 @@ sub post_check_client_groups {
   $self->post_check_client_group($config, 'client', $first_mysqld->name());
 
   # Then generate [client.<suffix>] for each [mysqld.<suffix>].
-  foreach my $mysqld ($config->like('mysqld.')) {
+  foreach my $mysqld ($config->like('mysqld\.')) {
     $self->post_check_client_group($config, 'client' . $mysqld->after('mysqld'),
                                    $mysqld->name());
   }
@@ -545,7 +545,7 @@ sub post_fix_mysql_cluster_section {
   foreach my $group ($config->like('cluster_config\.\w*$')) {
     my @urls;
     # Generate ndb_connectstring for this cluster
-    foreach my $ndb_mgmd ($config->like('cluster_config.ndb_mgmd.')) {
+    foreach my $ndb_mgmd ($config->like('cluster_config\.ndb_mgmd\.')) {
       if ($ndb_mgmd->suffix() eq $group->suffix()) {
         my $host = $ndb_mgmd->value('HostName');
         my $port = $ndb_mgmd->value('PortNumber');
@@ -562,7 +562,7 @@ sub post_fix_mysql_cluster_section {
 
     # Add ndb_connectstring to each ndbd connected to this
     # cluster.
-    foreach my $ndbd ($config->like('cluster_config.ndbd.')) {
+    foreach my $ndbd ($config->like('cluster_config\.ndbd\.')) {
       if ($ndbd->suffix() eq $group->suffix()) {
         my $after = $ndbd->after('cluster_config.ndbd');
         $config->insert("ndbd$after",
@@ -572,7 +572,7 @@ sub post_fix_mysql_cluster_section {
 
     # Add ndb_connectstring to each ndb_mgmd connected to this
     # cluster.
-    foreach my $ndb_mgmd ($config->like('cluster_config.ndb_mgmd.')) {
+    foreach my $ndb_mgmd ($config->like('cluster_config\.ndb_mgmd\.')) {
       if ($ndb_mgmd->suffix() eq $group->suffix()) {
         my $after = $ndb_mgmd->after('cluster_config.ndb_mgmd');
         $config->insert("ndb_mgmd$after",
@@ -582,7 +582,7 @@ sub post_fix_mysql_cluster_section {
 
     # Add ndb_connectstring to each mysqld connected to this
     # cluster.
-    foreach my $mysqld ($config->like('cluster_config.mysqld.')) {
+    foreach my $mysqld ($config->like('cluster_config\.mysqld\.')) {
       if ($mysqld->suffix() eq $group->suffix()) {
         my $after = $mysqld->after('cluster_config.mysqld');
         $config->insert("mysqld$after",
@@ -762,17 +762,17 @@ sub new_config {
   $self->run_section_rules($config, 'cluster_config\.\w',
                            ({ 'CODE' => \&track_allocated_nodeid }));
 
-  $self->run_section_rules($config, 'cluster_config.ndb_mgmd.',
+  $self->run_section_rules($config, 'cluster_config\.ndb_mgmd\.',
                            @ndb_mgmd_rules);
 
-  $self->run_section_rules($config, 'ndb_mgmd.',
+  $self->run_section_rules($config, 'ndb_mgmd\.',
     ({ 'cluster-config-suffix' => \&fix_cluster_config_suffix },
      { 'bind-address' => \&fix_bind_address },
     ));
 
-  $self->run_section_rules($config, 'cluster_config.ndbd', @ndbd_rules);
+  $self->run_section_rules($config, 'cluster_config\.ndbd', @ndbd_rules);
 
-  $self->run_section_rules($config, 'mysqld.', @mysqld_rules);
+  $self->run_section_rules($config, 'mysqld\.', @mysqld_rules);
 
   # [mysqlbinlog] need additional settings
   $self->run_rules_for_group($config, $config->insert('mysqlbinlog'),
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index de931426b772..9d3fdb273492 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -379,10 +379,10 @@
 # Return list of specific servers
 sub _like { return $config ? $config->like($_[0]) : (); }
 
-sub mysqlds     { return _like('mysqld.'); }
-sub ndbds       { return _like('cluster_config.ndbd.'); }
-sub ndb_mgmds   { return _like('cluster_config.ndb_mgmd.'); }
-sub clusters    { return _like('mysql_cluster.'); }
+sub mysqlds     { return _like('mysqld\.'); }
+sub ndbds       { return _like('cluster_config\.ndbd\.'); }
+sub ndb_mgmds   { return _like('cluster_config\.ndb_mgmd\.'); }
+sub clusters    { return _like('mysql_cluster\.'); }
 sub all_servers { return (mysqlds(), ndb_mgmds(), ndbds()); }
 
 # Return an object which refers to the group named '[mysqld]'
@@ -2618,7 +2618,7 @@ ($)
       # ports_per_thread value should be 50.
       # - First set of 20 ports are reserved for mysqld servers (10 each for
       #   standard and admin connections)
-      # - Second set of 10 ports are reserver for Group replication
+      # - Second set of 10 ports are reserved for Group replication
       # - Third set of 10 ports are reserved for secondary engine plugin
       # - Fourth and last set of 10 ports are reserved for X plugin
       $::secondary_engine_port = $baseport + 30;