bzr commit into mysql-5.5-trunk-bugfixing branch (holyfoot:2909) Bug#48878

[Alexey Botchkov]

#At file:///home/hf/work/mysql_common/mysql-trunk-bugfixing/ based on revid:alik@ibmvm-20091112015856-utxcm03qr0pepdbe

 2909 Alexey Botchkov	2009-11-25
      Bug#48878      "Embedded" tests fail due to an unknown variable "shared-memory-base-name"
          the 'shared-memory-base-name' was added to the [client] section of the my.cnf file.
          That option isn't supported by the mysqltest_embedded.
      
      per-file comments:
        mysql-test/lib/My/ConfigFactory.pm

    modified:
      mysql-test/lib/My/ConfigFactory.pm
=== modified file 'mysql-test/lib/My/ConfigFactory.pm'
--- a/mysql-test/lib/My/ConfigFactory.pm	2009-11-12 12:10:26 +0000
+++ b/mysql-test/lib/My/ConfigFactory.pm	2009-11-25 12:12:23 +0000
@@ -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)
-    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());
+      }
     }
   }
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]