From fe22439f853207bcbb949c447e8441de30211090 Mon Sep 17 00:00:00 2001
From: MattRichardson <devnull@localhost>
Date: Tue, 30 Jul 2013 14:09:16 -0700
Subject: [PATCH 1/4] Fixes wsp-10190: Fixes issue around encoding of mysql
 backups (dumps)

Now uses --result-file option for mysqldump.exe rather than using file system
redirection, which was causing encoding issues in some instances
---
 .../WebsitePanel.Providers.Database.MySQL/MySqlServer.cs   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs
index 9dbb49b9..fbfecf14 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs
@@ -478,12 +478,11 @@ namespace WebsitePanel.Providers.Database
             string cmd = Path.Combine(MySqlBinFolder, "mysqldump.exe");
             string bakFile = Path.Combine(BackupTempFolder, backupName);
 
-            string args = string.Format(" --host={0} --port={1} --user={2} --password={3} --opt --skip-extended-insert --skip-quick --skip-comments {4}",
-                ServerName, ServerPort,
-				RootLogin, RootPassword, databaseName);
+            string args = string.Format(" --host={0} --port={1} --user={2} --password={3} --opt --skip-extended-insert --skip-quick --skip-comments --result-file=\"{4}\" {5}",
+                ServerName, ServerPort, RootLogin, RootPassword, bakFile, databaseName);
 
             // backup database
-            FileUtils.ExecuteSystemCommand(cmd, args, bakFile);
+            FileUtils.ExecuteSystemCommand(cmd, args);
 
             return bakFile;
         }

From 0201778c85d30803c582e596af581ca58cf9772d Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 30 Jul 2013 17:59:50 -0400
Subject: [PATCH 2/4] Added tag build-2.1.0.136 for changeset a980f621e144


From c91d377a93a5e0aade496e69b459e98abcc240ad Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 31 Jul 2013 11:57:07 +0300
Subject: [PATCH 3/4] Fixing scheduler service connection string issue

---
 WebsitePanel/build.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index 6f1125bf..503d7485 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -309,6 +309,9 @@
 		</MSBuild>		
 		
 		<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.SchedulerServiceInstaller\WebsitePanel.SchedulerServiceInstaller.csproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false"/>
+				
+		<XmlUpdate XmlFileName="$(EnterpriseServerBuild)\bin\WebsitePanel.SchedulerService.exe.config" Xpath="//configuration/connectionStrings/add/@connectionString" Value="${installer.connectionstring}"  />
+		<XmlUpdate XmlFileName="$(EnterpriseServerBuild)\bin\WebsitePanel.SchedulerService.exe.config" Xpath="//configuration/appSettings/add[@key=%22WebsitePanel.CryptoKey%22]/@value" Value="${installer.cryptokey}"  />
 		
 		<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.SchedulerService\Setup.SchedulerService.wixproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false">
 			<Output

From 1dbaeff662a3be1e2de0bb6768e54d6a1af9cddb Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 31 Jul 2013 09:48:13 -0400
Subject: [PATCH 4/4] Added tag build-2.1.0.137 for changeset 7451d81d0730