From f7bd2d16dbe816f79c8d65a0513926c023ad81d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 May 2016 20:48:49 +0200
Subject: [PATCH] Prepare upgrade of doliwamp

---
 build/exe/doliwamp/doliwamp.iss   | 1 +
 build/exe/doliwamp/my.ini.install | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index f771a2f19e0..8c6130437ac 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -663,6 +663,7 @@ begin
 		      //installDir et version de php
 		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
diff --git a/build/exe/doliwamp/my.ini.install b/build/exe/doliwamp/my.ini.install
index 8528ce1a62e..c855cc27a66 100644
--- a/build/exe/doliwamp/my.ini.install
+++ b/build/exe/doliwamp/my.ini.install
@@ -69,7 +69,7 @@ port=WAMPMYSQLPORT
 
 
 #Path to installation directory. All paths are usually resolved relative to this.
-basedir=WAMPROOT/bin/mysql/mysql5.6.17
+basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
 
 #log file
 log-error=WAMPROOT/logs/mysql.log