merging.

mysql-test/lib/My/ConfigFactory.pm

@@ -357,6 +357,8 @@ sub post_check_client_group {
   }
   
   if (IS_WINDOWS)
+  {
+    if (! $self->{ARGS}->{embedded})
     {
       # Shared memory base may or may not be defined (e.g not defined in embedded)
       my $shm = $group_to_copy_from->option("shared-memory-base-name");
@@ -365,6 +367,7 @@ sub post_check_client_group {
         $config->insert($client_group_name,"shared-memory-base-name", $shm->value());
       }
     }
+  }
 }