diff -Nur e-smith-mysql-2.6.0/createlinks e-smith-mysql-2.6.0_bz9438/createlinks
--- e-smith-mysql-2.6.0/createlinks	2016-02-05 23:29:32.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/createlinks	2016-04-11 22:28:32.650623140 +0200
@@ -21,7 +21,7 @@
 # When we do a restore, we want to start from a completely clean slate
 $event = "pre-restore";
 
-safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/mysqld");
+safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/mariadb");
 # Needs to be after shutdown of mysqld
 event_link("mysql-delete-db-files", $event, "99");
 
@@ -33,7 +33,7 @@
 foreach (qw(
 	/etc/my.cnf
 	/root/.my.cnf
-	/var/service/mysqld/set.password
+	/var/service/mariadb/set.password
 	))
 {
     templates2events("$_", $event);
@@ -47,8 +47,12 @@
 #--------------------------------------------------
 $event = "timezone-update";
 
-safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysqld");
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb");
 
 templates2events("/etc/e-smith/sql/init/10mysql_upgrade", 
 	"bootstrap-console-save");
 
+safe_touch("root/var/service/mariadb/down");
+safe_symlink("/var/service/mariadb", "root/service/mariadb");
+safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/mariadb");
+service_link_enhanced("mariadb", 50, 7);
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/LocalNetworkingOnly e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/LocalNetworkingOnly
--- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/LocalNetworkingOnly	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/LocalNetworkingOnly	2003-04-01 22:18:18.000000000 +0200
@@ -0,0 +1 @@
+yes
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/status e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/status
--- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/status	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/status	2003-04-01 22:18:18.000000000 +0200
@@ -0,0 +1 @@
+enabled
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/type e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/type
--- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/type	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/type	2003-04-01 22:18:18.000000000 +0200
@@ -0,0 +1 @@
+service
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/LocalNetworkingOnly e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/LocalNetworkingOnly
--- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/LocalNetworkingOnly	2003-04-01 22:18:18.000000000 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/LocalNetworkingOnly	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-yes
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/status e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/status
--- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/status	2003-04-01 22:18:18.000000000 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/status	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-enabled
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/type e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/type
--- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/type	2003-04-01 22:18:18.000000000 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/type	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-service
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/00mysqld2mariadb e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/migrate/00mysqld2mariadb
--- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/00mysqld2mariadb	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/migrate/00mysqld2mariadb	2016-04-11 21:54:47.134272093 +0200
@@ -0,0 +1,11 @@
+{
+  # Rename mysqld service entry to mariadb
+
+  my $mysqld = $DB->get('mysqld') or return;
+  my $mariadb = $DB->get('mariadb') ||
+                $DB->new_record('mariadb', { type => 'service' });
+
+  $mariadb->merge_props($mysqld->props);
+  $mysqld->delete;
+
+}
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/15innodb e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/migrate/15innodb
--- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/15innodb	2016-04-11 22:24:44.966702169 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/migrate/15innodb	2016-04-11 21:55:36.824255774 +0200
@@ -1,6 +1,6 @@
 {
 	# InnoDB is mandatory with mariadb
-	my $a = $DB->get("mysqld") or return;
-	return unless (exists $mysqld{'InnoDB'});
-	$DB->get_prop_and_delete('mysqld', 'InnoDB');
+	my $a = $DB->get("mariadb") or return;
+	return unless (exists $mariadb{'InnoDB'});
+	$DB->get_prop_and_delete('mariadb', 'InnoDB');
 }
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs	2016-04-11 22:24:44.967702168 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs	2016-04-11 21:58:24.737201676 +0200
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ( cat /home/e-smith/db/mysql/mysql.dump ;
-  cat /service/mysqld/set.password ) | mysql || exit 1
+  cat /service/mariadb/set.password ) | mysql || exit 1
 /usr/bin/mysql_upgrade
 P=$(cat /var/run/mariadb/mariadb.pid)
 /bin/rm /var/run/mariadb/mariadb.pid
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/00mysqld.log e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/00mysqld.log
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/00mysqld.log	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/00mysqld.log	2016-04-11 22:00:43.880158046 +0200
@@ -0,0 +1 @@
+/var/log/mariadb/mariadb.log
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/01mysqld.slow_queries e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/01mysqld.slow_queries
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/01mysqld.slow_queries	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/01mysqld.slow_queries	2016-04-11 22:01:16.948147831 +0200
@@ -0,0 +1 @@
+/var/log/mariadb/slow_queries.log
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/10startOptions e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/10startOptions
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/10startOptions	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/10startOptions	2003-12-22 17:45:45.000000000 +0100
@@ -0,0 +1 @@
+\{
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/50options e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/50options
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/50options	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/50options	2016-04-11 22:12:41.060949016 +0200
@@ -0,0 +1,13 @@
+        create 600 mysql mysql
+        notifempty
+        daily
+        rotate 3
+        missingok
+        nocompress
+        sharedscripts
+        postrotate
+        # just if mysqld is really running
+        if test -n "`ps acx|grep mysqld`"; then
+                /usr/bin/mysqladmin flush-logs
+        fi
+        endscript
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/99endOptions e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/99endOptions
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/99endOptions	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/99endOptions	2003-12-22 17:45:45.000000000 +0100
@@ -0,0 +1 @@
+\}
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/00mysqld.log e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/00mysqld.log
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/00mysqld.log	2003-12-22 17:45:45.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/00mysqld.log	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/var/log/mysqld.log 
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/01mysqld.slow_queries e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/01mysqld.slow_queries
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/01mysqld.slow_queries	2003-12-22 17:45:45.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/01mysqld.slow_queries	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/var/log/mysqld.slow_queries  
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/10startOptions e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/10startOptions
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/10startOptions	2003-12-22 17:45:45.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/10startOptions	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-\{
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/50options e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/50options
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/50options	2003-12-22 17:45:45.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/50options	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-        create 600 mysql mysql
-        notifempty
-	daily
-        rotate 3
-        missingok
-        nocompress
-	sharedscripts
-	postrotate
-	# just if mysqld is really running
-	if test -n "`ps acx|grep mysqld`"; then
-		/usr/bin/mysqladmin flush-logs
-	fi
-	endscript
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/99endOptions e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/99endOptions
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/99endOptions	2003-12-22 17:45:45.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/99endOptions	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-\}
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/var/service/mariadb/set.password e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/var/service/mariadb/set.password
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/var/service/mariadb/set.password	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/var/service/mariadb/set.password	2008-10-06 16:29:16.000000000 +0200
@@ -0,0 +1,11 @@
+{
+    use esmith::util;
+
+    my $pw = esmith::util::LdapPassword();
+
+    $OUT .= "use mysql;\n";
+    $OUT .= "ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
+    $OUT .= "UPDATE user SET password=password('$pw') WHERE user='root';\n";
+    $OUT .= "DELETE FROM user WHERE user='';\n";
+    $OUT .= "FLUSH PRIVILEGES;\n";
+}
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/var/service/mysqld/set.password e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/var/service/mysqld/set.password
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates/var/service/mysqld/set.password	2008-10-06 16:29:16.000000000 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/var/service/mysqld/set.password	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-{
-    use esmith::util;
-
-    my $pw = esmith::util::LdapPassword();
-
-    $OUT .= "use mysql;\n";
-    $OUT .= "ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
-    $OUT .= "UPDATE user SET password=password('$pw') WHERE user='root';\n";
-    $OUT .= "DELETE FROM user WHERE user='';\n";
-    $OUT .= "FLUSH PRIVILEGES;\n";
-}
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates.metadata/var/service/mariadb/set.password e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates.metadata/var/service/mariadb/set.password
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates.metadata/var/service/mariadb/set.password	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates.metadata/var/service/mariadb/set.password	2006-03-16 07:44:28.000000000 +0100
@@ -0,0 +1 @@
+PERMS=0400
diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates.metadata/var/service/mysqld/set.password e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates.metadata/var/service/mysqld/set.password
--- e-smith-mysql-2.6.0/root/etc/e-smith/templates.metadata/var/service/mysqld/set.password	2006-03-16 07:44:28.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates.metadata/var/service/mysqld/set.password	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-PERMS=0400
diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/control/d e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/d
--- e-smith-mysql-2.6.0/root/var/service/mariadb/control/d	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/d	2016-04-11 21:49:09.380386989 +0200
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/control/i e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/i
--- e-smith-mysql-2.6.0/root/var/service/mariadb/control/i	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/i	2016-04-11 21:49:09.380386989 +0200
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec kill -INT $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/control/q e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/q
--- e-smith-mysql-2.6.0/root/var/service/mariadb/control/q	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/q	2016-04-11 21:49:09.380386989 +0200
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec kill -QUIT $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/control/t e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/t
--- e-smith-mysql-2.6.0/root/var/service/mariadb/control/t	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/t	2016-04-11 21:49:09.380386989 +0200
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/log/run e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/log/run
--- e-smith-mysql-2.6.0/root/var/service/mariadb/log/run	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/log/run	2016-04-11 22:09:37.785000042 +0200
@@ -0,0 +1,26 @@
+#!/bin/sh
+ 
+ #----------------------------------------------------------------------
+ # copyright (C) 2003 Mitel Networks Corporation
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ #
+ # Technical support for this program is available from Mitel Networks
+ # Please visit our web site www.mitel.com/sme/ for details.
+ #----------------------------------------------------------------------
+ exec                                    \
+     /usr/local/bin/setuidgid smelog     \
+     /usr/local/bin/multilog t s5000000  \
+     /var/log/mariadb.run
diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/run e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/run
--- e-smith-mysql-2.6.0/root/var/service/mariadb/run	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/run	2016-04-11 21:49:09.381386988 +0200
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+exec 2>&1
+if [ ! -f /var/lib/mysql/mysql/user.frm ]
+then
+    setuidgid mysql sh /usr/bin/mysql_install_db
+    /usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables < ./set.password
+    if [ -f /home/e-smith/db/mysql/mysql.dump ]
+    then
+	/sbin/e-smith/expand-template /etc/e-smith/sql/init/00_restore_dumped_dbs
+    fi
+fi
+
+exec /usr/libexec/mysqld \
+ --defaults-file=/etc/my.cnf \
+  --basedir=/usr \
+   --datadir=/var/lib/mysql \
+    --user=mysql \
+     --pid-file=/var/run/mariadb/mariadb.pid
diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/control/d e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/d
--- e-smith-mysql-2.6.0/root/var/service/mysqld/control/d	2016-04-11 22:24:44.968702168 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/d	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/control/i e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/i
--- e-smith-mysql-2.6.0/root/var/service/mysqld/control/i	2016-04-11 22:24:44.968702168 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/i	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec kill -INT $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/control/q e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/q
--- e-smith-mysql-2.6.0/root/var/service/mysqld/control/q	2016-04-11 22:24:44.968702168 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/q	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec kill -QUIT $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/control/t e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/t
--- e-smith-mysql-2.6.0/root/var/service/mysqld/control/t	2016-04-11 22:24:44.969702168 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/t	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/log/run e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/log/run
--- e-smith-mysql-2.6.0/root/var/service/mysqld/log/run	2004-12-20 22:03:36.000000000 +0100
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/log/run	1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-#!/bin/sh
- 
- #----------------------------------------------------------------------
- # copyright (C) 2003 Mitel Networks Corporation
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- #
- # Technical support for this program is available from Mitel Networks
- # Please visit our web site www.mitel.com/sme/ for details.
- #----------------------------------------------------------------------
- exec                                    \
-     /usr/local/bin/setuidgid smelog     \
-     /usr/local/bin/multilog t s5000000  \
-     /var/log/mysqld
diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/run e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/run
--- e-smith-mysql-2.6.0/root/var/service/mysqld/run	2016-04-11 22:24:44.969702168 +0200
+++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/run	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-exec 2>&1
-if [ ! -f /var/lib/mysql/mysql/user.frm ]
-then
-    setuidgid mysql sh /usr/bin/mysql_install_db
-    /usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables < ./set.password
-    if [ -f /home/e-smith/db/mysql/mysql.dump ]
-    then
-	/sbin/e-smith/expand-template /etc/e-smith/sql/init/00_restore_dumped_dbs
-    fi
-fi
-
-exec /usr/libexec/mysqld \
- --defaults-file=/etc/my.cnf \
-  --basedir=/usr \
-   --datadir=/var/lib/mysql \
-    --user=mysql \
-     --pid-file=/var/run/mariadb/mariadb.pid