Connector/NET commit: r765 - in trunk: . Driver/Source

[rburnett]

Modified:
   trunk/CHANGES
   trunk/Driver/Source/UsageAdvisor.cs
Log:
Bug #29124 Usage Advisor not checking UseUsageAdvisor setting 

Fixed problem where usage advisor warnings for unnecessary field conversions
and not reading all rows of a resultset would output even if you
did not request usage advisor warnings. (merged from 5.0)

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2007-06-15 18:00:56 UTC (rev 764)
+++ trunk/CHANGES	2007-06-15 18:05:19 UTC (rev 765)
@@ -44,7 +44,10 @@
   - Fixed problem where any attempt to not read all the records returned
     from a select where each row of the select is greater than 1024 bytes
     would hang the driver.
-  
+  - Fixed problem where usage advisor warnings for unnecessary field conversions
+    and not reading all rows of a resultset would output even if you
+    did not request usage advisor warnings. (Bug #29124)
+    
 Version 5.0.7 5/16/2007
 
   Bugs fixed

Modified: trunk/Driver/Source/UsageAdvisor.cs
===================================================================
--- trunk/Driver/Source/UsageAdvisor.cs	2007-06-15 18:00:56 UTC (rev 764)
+++ trunk/Driver/Source/UsageAdvisor.cs	2007-06-15 18:05:19 UTC (rev 765)
@@ -62,27 +62,31 @@
             LogUAFooter();
         }
 
-        public void ReadPartialRowSet(string cmdText, bool[] uaFieldsUsed, MySqlField[]
fields)
-        {
+		public void ReadPartialRowSet(string cmdText, bool[] uaFieldsUsed, MySqlField[] fields)
+		{
+            if (!conn.Settings.UseUsageAdvisor) return;
+
             LogUAHeader(cmdText);
-            Logger.WriteLine("Reason: Every column was not accessed.  Consider a more
focused query.");
-            Logger.Write("Fields not accessed: ");
-            for (int i = 0; i < uaFieldsUsed.Length; i++)
-                if (!uaFieldsUsed[i])
-                    Logger.Write(" " + fields[i].ColumnName);
-            Logger.WriteLine(" ");
-            LogUAFooter();
-        }
+			Logger.WriteLine("Reason: Every column was not accessed.  Consider a more focused
query.");
+			Logger.Write("Fields not accessed: ");
+			for (int i = 0; i < uaFieldsUsed.Length; i++)
+				if (!uaFieldsUsed[i])
+					Logger.Write(" " + fields[i].ColumnName);
+			Logger.WriteLine(" ");
+			LogUAFooter();
+		}
 
-        public void Converting(string cmdText, string columnName,
-                               string fromType, string toType)
-        {
+		public void Converting(string cmdText, string columnName,
+									  string fromType, string toType)
+		{
+            if (!conn.Settings.UseUsageAdvisor) return;
+
             LogUAHeader(cmdText);
-            Logger.WriteLine("Reason: Performing unnecessary conversion on field "
-                             + columnName + ".");
-            Logger.WriteLine("From: " + fromType + " to " + toType);
-            LogUAFooter();
-        }
+			Logger.WriteLine("Reason: Performing unnecessary conversion on field "
+									  + columnName + ".");
+			Logger.WriteLine("From: " + fromType + " to " + toType);
+			LogUAFooter();
+		}
 
         private void LogUAWarning(string cmdText, string reason)
         {
@@ -104,4 +108,4 @@
             Logger.WriteLine("-----------------------------------");
         }
     }
-}
\ No newline at end of file
+}