[Mapbender-commits] r4597 - branches/2.6/resources/db

[svn_mapbender at osgeo.org]

Author: tbaschetti
Date: 2009-09-04 06:34:29 -0400 (Fri, 04 Sep 2009)
New Revision: 4597

Modified:
   branches/2.6/resources/db/install_2.6.bat
   branches/2.6/resources/db/install_2.6.sh
Log:
added update for mysql-db


Modified: branches/2.6/resources/db/install_2.6.bat
===================================================================
--- branches/2.6/resources/db/install_2.6.bat	2009-09-03 14:21:48 UTC (rev 4596)
+++ branches/2.6/resources/db/install_2.6.bat	2009-09-04 10:34:29 UTC (rev 4597)
@@ -138,9 +138,6 @@
 goto POFILES
 
 :INSTMYSQL
-# Update to 2.6 is missing...
-echo Sorry, Mysql is not fully supported, exiting...
-goto END:
 IF %DBHOST%x==x set DBHOST=localhost
 IF %DBPORT%x==x set DBPORT=3306
 
@@ -158,8 +155,11 @@
 mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_mysql_%USEDBENC%.sql > log_update.txt 2> err_update.txt
 echo update to 2.5.1
 mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
-rem echo update to 2.6
-rem mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
+echo update to 2.6rc1
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
+echo update to 2.6rc2
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.6rc1_to_2.6rc2_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
+
 
 GOTO POFILES
 

Modified: branches/2.6/resources/db/install_2.6.sh
===================================================================
--- branches/2.6/resources/db/install_2.6.sh	2009-09-03 14:21:48 UTC (rev 4596)
+++ branches/2.6/resources/db/install_2.6.sh	2009-09-04 10:34:29 UTC (rev 4597)
@@ -127,20 +127,27 @@
         exit 1;
     fi
 
-    echo "MYSQL-Version not available!!!"
-    echo ""
-	exit 1
+    echo "Your password will be asked several times, this is normal"
+    echo "creating database"
     if [ $DBENCODING = "ISO-8859-1" ]
     then
-        mysql -e "create database $DBNAME CHARACTER SET latin1 COLLATE latin1_german1_ci;" -p$DBPASSWORD
+        mysql -e "create database $DBNAME CHARACTER SET latin1 COLLATE latin1_german1_ci;" -p$DBPASSWORD -u $DBUSER
     else
-        mysql -e "create database $DBNAME CHARACTER SET utf8 COLLATE utf8_general_ci;" -p$DBPASSWORD
+        mysql -e "create database $DBNAME CHARACTER SET utf8 COLLATE utf8_general_ci;" -p$DBPASSWORD -u $DBUSER
     fi
-	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
-	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
-	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5_to_2.5.1rc1_mysql_$DBENCODING.sql > log_update.txt 2> err_update.txt
-	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
-	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1_to_2.6rc1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
+	echo "creating schema"
+	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
+	echo "loading data"
+	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
+	echo "update to 2.5.1rc1"
+	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5_to_2.5.1rc1_mysql_$DBENCODING.sql > log_update.txt 2> err_update.txt
+	echo "update to 2.5.1"
+	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
+	echo "update to 2.6rc1"
+	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1_to_2.6rc1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
+	echo "update to 2.6rc2"
+	mysql $DBNAME -p$DBPASSWORD -u $DBUSER -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.6rc1_to_2.6rc2_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
+
 	
 }