Index: unix_installer/installer-package/ant-scripts/configure-database.xml
===================================================================
diff -u -ra2f8b16b34b729e4cb97f9444102144c68a17dc1 -rdcba8be00c08df0eb2ac0782c92c7d06f42dc881
--- unix_installer/installer-package/ant-scripts/configure-database.xml	(.../configure-database.xml)	(revision a2f8b16b34b729e4cb97f9444102144c68a17dc1)
+++ unix_installer/installer-package/ant-scripts/configure-database.xml	(.../configure-database.xml)	(revision dcba8be00c08df0eb2ac0782c92c7d06f42dc881)
@@ -13,7 +13,7 @@
 				<filter token="DB_NAME" value="${DB_NAME}" />
                 		<filter token="DB_USER" value="${DB_USER}" />
                 		<filter token="DB_PASS" value="${DB_PASS}" />
-				<filter token="SQL_GRANT" value="${SQL_GRANT}" />
+                		<filter token="SQL_HOST" value="${SQL_HOST}" />
 			</filterset>
 		</copy>
 
Index: unix_installer/installer-package/sql-scripts/create-database.sql
===================================================================
diff -u -rc6a8998567722aec174bb639b1fb4d81dece93d8 -rdcba8be00c08df0eb2ac0782c92c7d06f42dc881
--- unix_installer/installer-package/sql-scripts/create-database.sql	(.../create-database.sql)	(revision c6a8998567722aec174bb639b1fb4d81dece93d8)
+++ unix_installer/installer-package/sql-scripts/create-database.sql	(.../create-database.sql)	(revision dcba8be00c08df0eb2ac0782c92c7d06f42dc881)
@@ -1,7 +1,9 @@
+-- This is used for a local database only (so @SQL_HOST@) always ends up as localhost. For separate MySQL servers, the user and the db must be created manually.
+
 SET FOREIGN_KEY_CHECKS=0;
 DROP DATABASE IF EXISTS @DB_NAME@;
 CREATE DATABASE @DB_NAME@ DEFAULT CHARACTER SET utf8;
 SET FOREIGN_KEY_CHECKS=1;
-GRANT ALL PRIVILEGES ON *.* TO @DB_USER@@@SQL_GRANT@ IDENTIFIED BY '@DB_PASS@';
-REVOKE PROCESS,SUPER ON *.* from @DB_USER@@@SQL_GRANT@;
+GRANT ALL PRIVILEGES ON *.* TO @DB_USER@@@SQL_HOST@ IDENTIFIED BY '@DB_PASS@';
+REVOKE PROCESS,SUPER ON *.* from @DB_USER@@@SQL_HOST@;
 USE @DB_NAME@;