merging.

dd03daef · Alexey Botchkov · 2fa93b84 · a07d7da4 · dd03daef
Commit dd03daef authored Nov 25, 2009 by Alexey Botchkov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/My/ConfigFactory.pm +7 -4

No files found.
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -358,11 +358,14 @@ sub post_check_client_group {
  if (IS_WINDOWS)
  {
-    # Shared memory base may or may not be defined (e.g not defined in embedded)
+    if (! $self->{ARGS}->{embedded})
-    my $shm = $group_to_copy_from->option("shared-memory-base-name");
-    if (defined $shm)
    {
-      $config->insert($client_group_name,"shared-memory-base-name", $shm->value());
+      # 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");
+      if (defined $shm)
+      {
+        $config->insert($client_group_name,"shared-memory-base-name", $shm->value());
+      }
    }
  }
 }