--- rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-mariadb1.patch 2016/03/31 11:25:33 1.1 +++ rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-mariadb1.patch 2016/03/31 12:57:39 1.2 @@ -5,8 +5,8 @@ diff -Nur e-smith-mysql-2.6.0.old/root/e +{ + # InnoDB is mandatory with mariadb + my $a = $DB->get("mysqld") or return; -+ return unless (exists $mysqld{'InnoDB'}; -+ $DB->delete_prop('mysqld', 'InnoDB'); ++ 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