bzr commit into connector-net-6.0 branch (reggie.burnett:740) Bug#45474

[Reggie Burnett]

#At file:///D:/bzr-connector-net/6.0/ based on revid:reggie.burnett@stripped

  740 Reggie Burnett	2009-08-03
      fixed 'can't find svctag.xml' installer bug (thanks Iggy!)  (bug #45474)

    modified:
      CHANGES
      Installer/registration.wxs
      Installer/registration/mysql_ca.dll
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2009-07-31 22:42:55 +0000
+++ b/CHANGES	2009-08-03 17:41:43 +0000
@@ -9,6 +9,7 @@
   to fail (bug #46100)
 - fixed mono compilation by removing the space delimited warning list from the project file
   and including a solution that builds with MonoDevelop 2.0. (bug #42411)
+- fixed 'can't find svctag.xml' installer bug (thanks Iggy!)  (bug #45474)
   
 Version 6.0.4
 - fixed regression where using stored procs with datasets (bug #44460)

=== modified file 'Installer/registration.wxs'
--- a/Installer/registration.wxs	2009-08-03 17:37:43 +0000
+++ b/Installer/registration.wxs	2009-08-03 17:41:43 +0000
@@ -72,7 +72,7 @@
     <CustomAction Id='GenRegistryUrn' BinaryKey='mysqlca' DllEntry='CACreateURN' Execute='immediate' Return='ignore' />
     <CustomAction Id='SetRegistryUrn' Property='RegistryUrn' Value='[NewURN]' />
     <!-- Set registration Date Time -->
-    <CustomAction Id='SetDateTime' BinaryKey='mysqlca' DllEntry='CASetRegDateTime' Execute='immediate' Return='check' />
+    <CustomAction Id='SetDateTime' BinaryKey='mysqlca' DllEntry='CASetRegDateTime' Execute='immediate' Return='ignore' />
     <!-- Update Offline Registration -->
     <CustomAction Id="UpdateRegistration.SetProperty" Return="check" Property="UpdateRegistration" Value="[INSTALLDIR]" />
     <CustomAction Id="UpdateRegistration" BinaryKey="mysqlca" DllEntry="CAUpdateOfflineReg" Execute="deferred" Return="ignore" HideTarget="yes" Impersonate="no"/>

=== modified file 'Installer/registration/mysql_ca.dll'
Binary files a/Installer/registration/mysql_ca.dll	2009-08-03 17:05:05 +0000 and b/Installer/registration/mysql_ca.dll	2009-08-03 17:41:43 +0000 differ

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