Connector/NET commit: r1001 - branches/5.1/TestSuite/Source

[rburnett]

Modified:
   branches/5.1/TestSuite/Source/BaseTest.cs
Log:
a couple of fixes in our base test class.  We had a couple of name conflicts that were preventing the class level vars from getting the right values.

Modified: branches/5.1/TestSuite/Source/BaseTest.cs
===================================================================
--- branches/5.1/TestSuite/Source/BaseTest.cs	2007-09-10 20:06:19 UTC (rev 1000)
+++ branches/5.1/TestSuite/Source/BaseTest.cs	2007-09-18 15:55:29 UTC (rev 1001)
@@ -61,13 +61,13 @@
 #if NET20
             host = ConfigurationManager.AppSettings["host"];
             string strPort = ConfigurationManager.AppSettings["port"];
-            string pipeName = ConfigurationManager.AppSettings["pipename"];
-            string memoryName = ConfigurationManager.AppSettings["memory_name"];
+            pipeName = ConfigurationManager.AppSettings["pipename"];
+            memoryName = ConfigurationManager.AppSettings["memory_name"];
 #else
-            string host = ConfigurationSettings.AppSettings["host"];
+            host = ConfigurationSettings.AppSettings["host"];
             string strPort = ConfigurationSettings.AppSettings["port"];
-            string pipeName = ConfigurationSettings.AppSettings["pipename"];
-            string memoryName = ConfigurationSettings.AppSettings["memory_name"];
+            pipeName = ConfigurationSettings.AppSettings["pipename"];
+            memoryName = ConfigurationSettings.AppSettings["memory_name"];
 #endif
             if (strPort != null)
                 port = Int32.Parse(strPort);
@@ -75,7 +75,7 @@
 				host = "localhost";
             if (pipeName == null)
 				pipeName = "MYSQL";
-            if (memoryName != null)
+            if (memoryName == null)
 				memoryName = "MYSQL";
 
 			// we don't use FileVersion because it's not available