Connector/NET commit: r1094 - in branches/5.1: . Driver/Source TestSuite/Source

[rburnett]

Modified:
   branches/5.1/CHANGES
   branches/5.1/Driver/Source/NativeDriver.cs
   branches/5.1/TestSuite/Source/Syntax.cs
Log:
rolled out changeset where we remove the FOUND_ROWS connection option

Modified: branches/5.1/CHANGES
===================================================================
--- branches/5.1/CHANGES	2007-11-08 16:31:38 UTC (rev 1093)
+++ branches/5.1/CHANGES	2007-11-08 16:32:53 UTC (rev 1094)
@@ -110,8 +110,6 @@
   - fixed problem where changing the connection string of a connection to one that changes
     the parameter marker after the connection had been assigned to a command but before
     the connection is opened can cause parameters to not be found (bug #13991) 
-  - Removed the FOUND_ROWS connection option so that the connector returns that actual
-    number of changed rows not the number of matched rows. (bug #32135)
                             
 Version 5.0.8  8/16/2007
   Bug #28706 Log messages are truncated  

Modified: branches/5.1/Driver/Source/NativeDriver.cs
===================================================================
--- branches/5.1/Driver/Source/NativeDriver.cs	2007-11-08 16:31:38 UTC (rev 1093)
+++ branches/5.1/Driver/Source/NativeDriver.cs	2007-11-08 16:32:53 UTC (rev 1094)
@@ -332,7 +332,7 @@
         /// </summary>
         private void SetConnectionFlags()
         {
-            ClientFlags flags = 0;
+            ClientFlags flags = ClientFlags.FOUND_ROWS;
 
             if (version.isAtLeast(4, 1, 1))
             {

Modified: branches/5.1/TestSuite/Source/Syntax.cs
===================================================================
--- branches/5.1/TestSuite/Source/Syntax.cs	2007-11-08 16:31:38 UTC (rev 1093)
+++ branches/5.1/TestSuite/Source/Syntax.cs	2007-11-08 16:32:53 UTC (rev 1094)
@@ -527,22 +527,5 @@
                 Assert.IsTrue(row["Command"].GetType().Name == "String");
             }
 		}
-
-        /// <summary>
-        /// Bug #32135 row_count() function returns difference value using console and .net 
-        /// </summary>
-        [Test]
-        public void RowCount()
-        {
-            execSQL("INSERT INTO Test VALUES (1, 'Test')");
-            MySqlCommand cmd = new MySqlCommand("UPDATE Test SET name='Test' WHERE name='Test'", conn);
-            int affected = cmd.ExecuteNonQuery();
-
-            cmd.CommandText = "SELECT row_count()";
-            object count = cmd.ExecuteScalar();
-
-            Assert.AreEqual(affected, count);
-            Assert.AreEqual(0, affected);
-        }
 	}
 }