Merge branch 'master' into dist/eole/2.6.2/master

preservice/25-bdd-init

@@ -20,6 +20,7 @@ logfile="${logdir}/maria-init.log"
 
 if [[ ${ROLE} == "Leader" ]]
 then
+   service mysql start
    ${passwd} ${PASSWORD}
 
    # Run secure installation script
@@ -32,8 +33,15 @@ y
 y
 y
 __EOF__
-   touch ${INITDONE}
-   exit ${?}
+   if [[ ${?} -eq 0 ]]
+   then
+	   service mysql stop
+	   touch ${INITDONE}
+	   exit ${?}
+   else
+	   service mysql stop
+	   exit ${?}
+   fi
 else
    exit 0
 fi