Merge branch 'master' of git://github.com/jb-boin/mariadb-10.0 into jb-boin-master

Conflicts:
	debian/changelog

debian/changelog

@@ -22,6 +22,10 @@ mariadb-10.0 (10.0.20-3) unstable; urgency=medium
     the /var/lib/mysql directory was a symbolic link with an absolute path
     as target (Closes: #792918)
 
+  [ Jean Weisbuch ]
+  * Added a Debian default file for the mariadb-server-10.0 package which
+    allows to set the MYSQLD_STARTUP_TIMEOUT variable used in the init script
+
  -- Otto Kekäläinen <otto@seravo.fi>  Fri, 24 Jul 2015 23:00:00 +0300
 
 mariadb-10.0 (10.0.20-2) unstable; urgency=low

debian/mariadb-server-10.0.default

+# The delay in seconds the init script waits for the server to be up and running after having started "mysqld_safe" to run the "/etc/mysql/debian-start" script.
+# If the server is still not responding after the delay, the script won't be executed and an error will be thrown on the syslog.
+# Default: 30
+#MYSQLD_STARTUP_TIMEOUT=30

debian/mariadb-server-10.0.mysql.init

@@ -28,6 +28,10 @@ MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 # priority can be overriden and "-s" adds output to stderr
 ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
 
+if [ -f /etc/default/mariadb-server-10.0 ] ; then
+        . /etc/default/mariadb-server-10.0
+fi
+
 # Safeguard (relative paths, core dumps..)
 cd /
 umask 077