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

[rburnett]

Modified:
   branches/5.1/CHANGES
   branches/5.1/Driver/Source/Field.cs
Log:
Merged r 975 from 5.0

Modified: branches/5.1/CHANGES
===================================================================
--- branches/5.1/CHANGES	2007-08-24 20:56:05 UTC (rev 975)
+++ branches/5.1/CHANGES	2007-08-24 21:02:21 UTC (rev 976)
@@ -61,6 +61,11 @@
     What this means is that passing in null as a database restriction will report
     objects on the currently selected database only.
     
+Version 5.0.9   
+
+  - Fixed problem where fields that were blobs but did not include the BLOB flag were
treated
+    as binary when they should have been treated as text.  (Bug #30233)    
+    
 Version 5.0.8  8/16/2007
   Bug #28706 Log messages are truncated  
   - Fixed a problem with compression over a network.  We were letting the inflate stream
read

Modified: branches/5.1/Driver/Source/Field.cs
===================================================================
--- branches/5.1/Driver/Source/Field.cs	2007-08-24 20:56:05 UTC (rev 975)
+++ branches/5.1/Driver/Source/Field.cs	2007-08-24 21:02:21 UTC (rev 976)
@@ -143,16 +143,17 @@
             get { return (colFlags & ColumnFlags.PRIMARY_KEY) > 0; }
         }
 
-        public bool IsBlob
-        {
-            get 
-            {
-                return (mySqlDbType >= MySqlDbType.TinyBlob &&
-                mySqlDbType <= MySqlDbType.Blob) ||
-                (mySqlDbType >= MySqlDbType.TinyText &&
-                mySqlDbType <= MySqlDbType.Text);
-            }
-        }
+		public bool IsBlob
+		{
+			get
+			{
+				return (mySqlDbType >= MySqlDbType.TinyBlob &&
+				mySqlDbType <= MySqlDbType.Blob) ||
+				(mySqlDbType >= MySqlDbType.TinyText &&
+				mySqlDbType <= MySqlDbType.Text) ||
+				(colFlags & ColumnFlags.BLOB) > 0;
+			}
+		}
 
         public bool IsBinary
         {