From 47bffd43f30fad2abdae4511c59802ea2d55064c Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Fri, 19 Feb 2010 13:45:25 +0100
Subject: [PATCH] Fixed incomplete merge of 48878, embedded tests fail on
 Windows

---
 mysql-test/lib/My/ConfigFactory.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
index c4d68e7127c..41b595c80e8 100644
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -357,11 +357,14 @@ sub post_check_client_group {
   
   if (IS_WINDOWS)
   {
-    # 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)
+    if (! $self->{ARGS}->{embedded})
     {
-      $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());
+      }
     }
   }
 }