List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:November 9 2010 8:31pm
Subject:bzr commit into connector-net-6.1 branch (reggie.burnett:858)
View as plain text  
#At file:///C:/Users/Reggie/work/connector-net/6.1/ based on revid:reggie.burnett@stripped

  858 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-10-07 21:56:09 +0000
+++ b/CHANGES	2010-11-09 20:31:49 +0000
@@ -5,6 +5,7 @@
 - fixed problem with using bit parameters as output (bug #56756)
 - fixed MySqlCommand.Clone so that the default command timeoout functionality is not disabled when
   you clone a command (bug #56806)
+- fixed loading of mono.posix assembly to use the right assembly (bug #56410)
 
 Version 6.1.5
 - Fix authorization popup after modifying stored procedure in VS (Bug #44715)

=== modified file 'MySql.Data/Provider/Source/common/StreamCreator.cs'
--- a/MySql.Data/Provider/Source/common/StreamCreator.cs	2010-08-18 19:03:33 +0000
+++ b/MySql.Data/Provider/Source/common/StreamCreator.cs	2010-11-09 20:31: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/reggie.burnett@oracle.com-20101109203149-b1ludh8732hij270.bundle
Thread
bzr commit into connector-net-6.1 branch (reggie.burnett:858) Reggie Burnett9 Nov