From b3e9d320f3003eb8ffe0b87caa280075e0e05a56 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Sun, 6 Apr 2025 14:45:55 -0400 Subject: [PATCH] * Sun Apr 06 2025 Jean-Philippe Pialasse 11.0.0-13.sme - fix Specified key was too long with older mysql db tables [SME: 12980] added back mysql_upgrade in 00_restore_dumped_dbs * Fri Apr 04 2025 Jean-Philippe Pialasse 11.0.0-12.sme - restore root user, pasword and socket login [SME: 12978] --- .../templates/etc/e-smith/sql/init/00_restore_dumped_dbs | 4 +++- smeserver-mysql.spec | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs b/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs index 5aa4530..5ac0bd0 100644 --- a/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs +++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs @@ -2,9 +2,11 @@ # we need to filter out mysql.user table from older mariadb and from mysql # in SME10 we added for migration creation of mysql.privileges.dump with mariadb 10.5 and newer syntax -( /usr/bin/mysql_filter_user_table /home/e-smith/db/mysql/mysql.dump ; +# non RH ocmpiled version of mariadb limits MyISAM index to 1000 bytes, newer mysql db use Aria as engine for those tables +( /usr/bin/mysql_filter_user_table /home/e-smith/db/mysql/mysql.dump |sed -e 's/ENGINE=MyISAM/ENGINE=Aria/'; [ -f /home/e-smith/db/mysql/mysql.privileges.dump ] && cat /home/e-smith/db/mysql/mysql.privileges.dump; cat /var/lib/mysql.private/set.password ) | mysql || exit 1 +/usr/bin/mysql_upgrade /bin/rm /run/mariadb/mariadb.pid /usr/bin/systemctl restart mariadb.service for i in $(seq 1 20); diff --git a/smeserver-mysql.spec b/smeserver-mysql.spec index b0f4e3b..28b2d08 100644 --- a/smeserver-mysql.spec +++ b/smeserver-mysql.spec @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mysql configuration and templates. %define name smeserver-mysql Name: %{name} %define version 11.0.0 -%define release 12 +%define release 13 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %changelog +* Sun Apr 06 2025 Jean-Philippe Pialasse 11.0.0-13.sme +- fix Specified key was too long with older mysql db tables [SME: 12980] + added back mysql_upgrade in 00_restore_dumped_dbs + * Fri Apr 04 2025 Jean-Philippe Pialasse 11.0.0-12.sme - restore root user, pasword and socket login [SME: 12978]