bzr commit into connector-net-trunk branch (reggie.burnett:941)

[Reggie Burnett]

#At file:///C:/Users/Reggie/work/connector-net/trunk/ based on revid:reggie.burnett@stripped

  941 Reggie Burnett	2010-11-09 [merge]
      merged

    modified:
      CHANGES
      MySql.Data/Provider/Source/common/StreamCreator.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-11-03 21:04:38 +0000
+++ b/CHANGES	2010-11-09 20:35:14 +0000
@@ -1,8 +1,7 @@
 Version 6.3.6
-- Fixed TracingDriver so that it normalizes long queries before truncation so we don't get exceptions when quoted
-  tokens land on the 300th character (bug #57641)
-- added code that will attempt to enumerate procs via mysql.proc the first time. If we get an 1142 error then we
-  mark that we don't have access to that table and use IS from then on. (bug #36694)
+- Fixed TracingDriver so that it normalizes long queries before truncation so we don't get exceptions     when quoted tokens land on the 300th character (bug #57641)
+- added code that will attempt to enumerate procs via mysql.proc the first time. If we get an 1142       error then we mark that we don't have access to that table and use IS from then on. (bug #36694)
+- fixed loading of mono.posix assembly to use the right assembly (bug #56410)
 
 Version 6.3.5
 - Fix installer bug related to .NET FW 4.0 (bug #56580)

=== modified file 'MySql.Data/Provider/Source/common/StreamCreator.cs'
--- a/MySql.Data/Provider/Source/common/StreamCreator.cs	2010-08-18 19:48:34 +0000
+++ b/MySql.Data/Provider/Source/common/StreamCreator.cs	2010-11-09 20:32:49 +0000
@@ -162,8 +162,7 @@
 
 		private static EndPoint CreateUnixEndPoint(string host)
 		{
-			// first we need to load the Mono.posix assembly
-			Assembly a = Assembly.Load("Mono.Posix");
+			// first we need to load the Mono.posix assembly			Assembly a = Assembly.Load(@"Mono.Posix, Version=2.0.0.0, 				Culture=neutral, PublicKeyToken=0738eb9f132ed756");
 
 			// then we need to construct a UnixEndPoint object
 			EndPoint ep = (EndPoint)a.CreateInstance("Mono.Posix.UnixEndPoint",


Attachment: [text/bzr-bundle] bzr/[e-mail]