From: Date: October 25 2007 8:49pm
Subject: Connector/NET commit: r1045 - in branches/5.0: . Driver/Source
List-Archive: http://lists.mysql.com/commits/36366
X-Bug: 31731
Message-Id: <200710251849.l9PInI0n027760@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/5.0/CHANGES
   branches/5.0/Driver/Source/Installer.cs
Log:
Fixed problem with installer where attempting to install over a failed uninstall could leave multiple clients registered in machine.config.  (Bug #31731) 

Modified: branches/5.0/CHANGES
===================================================================
--- branches/5.0/CHANGES	2007-10-25 18:47:07 UTC (rev 1044)
+++ branches/5.0/CHANGES	2007-10-25 18:49:17 UTC (rev 1045)
@@ -12,6 +12,8 @@
   - Fixed problem with installer where the installation might report a failure to
     remove the performance counters if the performance counter category had already 
     been removed for some reason    
+  - Fixed problem with installer where attempting to install over a failed uninstall 
+    could leave multiple clients registered in machine.config.  (Bug #31731) 
     
 Version 5.0.8   8/16/2007
 

Modified: branches/5.0/Driver/Source/Installer.cs
===================================================================
--- branches/5.0/Driver/Source/Installer.cs	2007-10-25 18:47:07 UTC (rev 1044)
+++ branches/5.0/Driver/Source/Installer.cs	2007-10-25 18:49:17 UTC (rev 1045)
@@ -128,16 +128,15 @@
                 if (node.Attributes == null) continue;
                 foreach (XmlAttribute attr in node.Attributes)
                 {
-                    if (attr.Name == "type" && attr.Value == type)
+                    if (attr.Name == "invariant" && attr.Value == "MySql.Data.MySqlClient")
                     {
-                        alreadyThere = true;
+                        nodes[0].RemoveChild(node);
                         break;
                     }
                 }
             }
 
-			if (! alreadyThere)
-				nodes[0].AppendChild(newNode);
+    		nodes[0].AppendChild(newNode);
 
 			// Save the document to a file and auto-indent the output.
 			XmlTextWriter writer = new XmlTextWriter(configPath, null);