Connector/NET commit: r597 - in branches/1.0: . TestSuite mysqlclient/Types

[rburnett]

Modified:
   branches/1.0/CHANGES
   branches/1.0/TestSuite/DataTypeTests.cs
   branches/1.0/mysqlclient/Types/MySqlValue.cs
Log:
Bug #25605 BINARY and VARBINARY is returned as a string 

Removed code that returned MySqlString for VarChar and Char and let it fall on through so
that the binary flag is checked.

Modified: branches/1.0/CHANGES
===================================================================
--- branches/1.0/CHANGES	2007-02-20 20:32:16 UTC (rev 596)
+++ branches/1.0/CHANGES	2007-02-20 20:34:53 UTC (rev 597)
@@ -1,6 +1,7 @@
 Version 1.0.10
     Bugs
     ----
+    Bug #25605 BINARY and VARBINARY is returned as a string 
     
     Other
     -----

Modified: branches/1.0/TestSuite/DataTypeTests.cs
===================================================================
--- branches/1.0/TestSuite/DataTypeTests.cs	2007-02-20 20:32:16 UTC (rev 596)
+++ branches/1.0/TestSuite/DataTypeTests.cs	2007-02-20 20:34:53 UTC (rev 597)
@@ -716,5 +716,25 @@
 			}
 		}
 
+		/// <summary>
+		/// Bug #25605 BINARY and VARBINARY is returned as a string 
+		/// </summary>
+		[Test]
+		public void BinaryAndVarBinary()
+		{
+			MySqlCommand cmd = new MySqlCommand("SELECT BINARY 'something' AS BinaryData", conn);
+			using (MySqlDataReader reader = cmd.ExecuteReader())
+			{
+				reader.Read();
+				byte[] buffer = new byte[2];
+				long read = reader.GetBytes(0, 0, buffer, 0, 2);
+				Assert.AreEqual('s', buffer[0]);
+				Assert.AreEqual('o', buffer[1]);
+				Assert.AreEqual(2, read);
+
+				string s = reader.GetString(0);
+				Assert.AreEqual("something", s);
+			}
+		}
 	}
 }

Modified: branches/1.0/mysqlclient/Types/MySqlValue.cs
===================================================================
--- branches/1.0/mysqlclient/Types/MySqlValue.cs	2007-02-20 20:32:16 UTC (rev 596)
+++ branches/1.0/mysqlclient/Types/MySqlValue.cs	2007-02-20 20:34:53 UTC (rev 597)
@@ -162,8 +162,6 @@
 				case MySqlDbType.Char:
                 case MySqlDbType.VarString:
 				case MySqlDbType.VarChar: 
-					return new MySqlString(null, type);
-
 				case MySqlDbType.Blob:
 				case MySqlDbType.MediumBlob:
 				case MySqlDbType.LongBlob: