diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/db/configuration/migrate/15innodb e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/15innodb
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/db/configuration/migrate/15innodb	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/15innodb	2016-03-31 07:03:46.001000000 -0400
@@ -0,0 +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');
+}
diff -Nur e-smith-mysql-2.6.0.old/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
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs	2016-02-05 17:29:32.000000000 -0500
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs	2016-03-31 06:33:11.107000000 -0400
@@ -3,12 +3,12 @@
 ( cat /home/e-smith/db/mysql/mysql.dump ;
   cat /service/mysqld/set.password ) | mysql || exit 1
 /usr/bin/mysql_upgrade
-P=$(cat /var/run/mysqld/mysqld.pid)
-/bin/rm /var/run/mysqld/mysqld.pid
+P=$(cat /var/run/mariadb/mariadb.pid)
+/bin/rm /var/run/mariadb/mariadb.pid
 kill -TERM $P
 for i in $(seq 1 20);
 do
-  if [ -f /var/run/mysqld/mysqld.pid ]
+  if [ -f /var/run/mariadb/mariadb.pid ]
   then
       /bin/rm /home/e-smith/db/mysql/mysql.dump
       exit 0
diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade	2016-02-05 17:29:32.000000000 -0500
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade	2016-03-31 06:34:02.469000000 -0400
@@ -1,12 +1,12 @@
 #!/bin/sh
 /usr/bin/mysql_upgrade 
 
-P=$(cat /var/run/mysqld/mysqld.pid)
-/bin/rm /var/run/mysqld/mysqld.pid
+P=$(cat /var/run/mariadb/mariadb.pid)
+/bin/rm /var/run/mariadb/mariadb.pid
 kill -TERM $P
 for i in $(seq 1 20);
 do
-  if [ -f /var/run/mysqld/mysqld.pid ]
+  if [ -f /var/run/mariadb/mariadb.pid ]
   then
       exit 0
   fi
diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/006pid-file e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/006pid-file
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/006pid-file	2003-12-18 17:10:32.000000000 -0500
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/006pid-file	2016-03-31 06:47:36.487000000 -0400
@@ -1 +1 @@
-pid-file=/var/run/mysqld/mysqld.pid
+pid-file=/var/run/mariadb/mariadb.pid
diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/009innodb e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/009innodb
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/009innodb	2016-02-05 17:29:31.000000000 -0500
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/009innodb	2016-03-31 06:47:05.763000000 -0400
@@ -1,7 +1,4 @@
 {
-    my $innodb = $mysqld{InnoDB} || 'disabled';
-
-    return "skip-innodb" unless $innodb eq 'enabled';
 
     # innodb is enabled. We'll use the MySQL-AB-recommended innodb
     # defaults for small to medium sites, from the my-medium.cnf file
@@ -10,9 +7,9 @@
     $OUT .= "innodb_data_file_path = ibdata1:10M:autoextend\n";
     $OUT .= "innodb_log_group_home_dir = /var/lib/mysql/\n";
     $OUT .= "innodb_buffer_pool_size = 16M\n";
-    $OUT .= "innodb_additional_mem_pool_size = 2M\n";
-    $OUT .= "innodb_log_file_size = 5M\n";
+    $OUT .= "innodb_additional_mem_pool_size = 250M\n";
+    $OUT .= "innodb_log_file_size = 125M\n";
     $OUT .= "innodb_log_buffer_size = 8M\n";
     $OUT .= "innodb_flush_log_at_trx_commit = 1\n";
-    $OUT .= "innodb_lock_wait_timeout = 50\n";
+    $OUT .= "innodb_lock_wait_timeout = 120\n";
 }
diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/d e-smith-mysql-2.6.0/root/var/service/mysqld/control/d
--- e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/d	2005-04-10 22:51:01.000000000 -0400
+++ e-smith-mysql-2.6.0/root/var/service/mysqld/control/d	2016-03-31 07:16:21.593000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec kill -TERM $(cat /var/run/mysqld/mysqld.pid)
+exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/i e-smith-mysql-2.6.0/root/var/service/mysqld/control/i
--- e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/i	2005-04-10 22:51:01.000000000 -0400
+++ e-smith-mysql-2.6.0/root/var/service/mysqld/control/i	2016-03-31 07:16:40.472000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec kill -INT $(cat /var/run/mysqld/mysqld.pid)
+exec kill -INT $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/q e-smith-mysql-2.6.0/root/var/service/mysqld/control/q
--- e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/q	2005-04-10 22:51:01.000000000 -0400
+++ e-smith-mysql-2.6.0/root/var/service/mysqld/control/q	2016-03-31 07:17:00.956000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec kill -QUIT $(cat /var/run/mysqld/mysqld.pid)
+exec kill -QUIT $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/t e-smith-mysql-2.6.0/root/var/service/mysqld/control/t
--- e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/t	2005-04-10 22:51:01.000000000 -0400
+++ e-smith-mysql-2.6.0/root/var/service/mysqld/control/t	2016-03-31 07:17:19.081000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec kill -TERM $(cat /var/run/mysqld/mysqld.pid)
+exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/run e-smith-mysql-2.6.0/root/var/service/mysqld/run
--- e-smith-mysql-2.6.0.old/root/var/service/mysqld/run	2008-10-06 10:29:16.000000000 -0400
+++ e-smith-mysql-2.6.0/root/var/service/mysqld/run	2016-03-31 07:08:39.644000000 -0400
@@ -16,4 +16,4 @@
   --basedir=/usr \
    --datadir=/var/lib/mysql \
     --user=mysql \
-     --pid-file=/var/run/mysqld/mysqld.pid
+     --pid-file=/var/run/mariadb/mariadb.pid