3 Commits

Author SHA1 Message Date
trevorb
c310fbff74 update check if mariadb running and exit 2025-07-21 14:28:17 +10:00
trevorb
17c47013a1 fix to allow upgrade of innodb to new pagesize as required by 12982 on install [SME: 13083] 2025-07-21 10:08:31 +10:00
cd59e93ccb * Thu Jun 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme
- fix conflict with MariaDB-server-compat [SME: 13024]
2025-06-05 16:23:33 -04:00
3 changed files with 41 additions and 6 deletions

View File

@@ -5,18 +5,18 @@ use esmith::Build::CreateLinks qw(:all);
# we add few link fromn old mysql things to mariadb things # we add few link fromn old mysql things to mariadb things
# some are provided by MariaDB-client-compat # some are provided by MariaDB-client-compat
#safe_symlink("/usr/bin/mariadb-dump","root/usr/bin/mysqldump"); #safe_symlink("/usr/bin/mariadb-dump","root/usr/bin/mysqldump");
safe_symlink("/usr/bin/mariadb-dumpslow","root/usr/bin/mysqldumpslow"); #safe_symlink("/usr/bin/mariadb-dumpslow","root/usr/bin/mysqldumpslow");
#safe_symlink("/usr/bin/mariadb-check","root/usr/bin/mysqlcheck"); #safe_symlink("/usr/bin/mariadb-check","root/usr/bin/mysqlcheck");
#safe_symlink("/usr/bin/mariadb-admin","root/usr/bin/mysqladmin"); #safe_symlink("/usr/bin/mariadb-admin","root/usr/bin/mysqladmin");
#safe_symlink("/usr/bin/mariadb-show","root/usr/bin/mysqlshow"); #safe_symlink("/usr/bin/mariadb-show","root/usr/bin/mysqlshow");
safe_symlink("/usr/bin/mariadb-upgrade","root/usr/bin/mysql_upgrade"); #safe_symlink("/usr/bin/mariadb-upgrade","root/usr/bin/mysql_upgrade");
#safe_symlink("/usr/bin/mariadb","root/usr/bin/mysql"); #safe_symlink("/usr/bin/mariadb","root/usr/bin/mysql");
#safe_symlink("/usr/bin/mariadb-access","root/usr/bin/mysqlaccess"); #safe_symlink("/usr/bin/mariadb-access","root/usr/bin/mysqlaccess");
#safe_symlink("/usr/bin/mariadb-binlog","root/usr/bin/mysqlbinlog"); #safe_symlink("/usr/bin/mariadb-binlog","root/usr/bin/mysqlbinlog");
safe_symlink("/usr/bin/mariadb-convert-table-format","root/usr/bin/mysql_convert_table_format"); #safe_symlink("/usr/bin/mariadb-convert-table-format","root/usr/bin/mysql_convert_table_format");
#safe_symlink("/usr/bin/mariadb-find-rows","root/usr/bin/mysql_find_rows"); #safe_symlink("/usr/bin/mariadb-find-rows","root/usr/bin/mysql_find_rows");
safe_symlink("/usr/bin/mariadb-fix-extensions","root/usr/bin/mysql_fix_extensions"); #safe_symlink("/usr/bin/mariadb-fix-extensions","root/usr/bin/mysql_fix_extensions");
safe_symlink("/usr/bin/mariadb-install-db","root/usr/bin/mysql_install_db"); #safe_symlink("/usr/bin/mariadb-install-db","root/usr/bin/mysql_install_db");
#safe_symlink("/usr/bin/mariadb-embedded","root/usr/bin/mysql_embedded"); #safe_symlink("/usr/bin/mariadb-embedded","root/usr/bin/mysql_embedded");
#-------------------------------------------------- #--------------------------------------------------
@@ -81,6 +81,13 @@ foreach (qw(
templates2events("$_", $event); templates2events("$_", $event);
} }
#--------------------------------------------------
# actions for post-install event
#--------------------------------------------------
$event = "post-install";
event_link("mysql-update-innodb-page-size", $event, "03");
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb");
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");

View File

@@ -0,0 +1,21 @@
#!/bin/sh
event=$1
# check event is defined or return
[[ -z "$event" ]] && exit 0
# check we run as post-install event or return
[[ "$event" == "post-install" ]] || exit 0
# check mariadb is not running or return
/usr/bin/pgrep mariadbd && exit 0
# ONLY delete the mysql data dirictory if it is initial state
# we assume if only mysql, test, sys and performance_schema this is the case
validdirs="/var/lib/mysql/mysql/ /var/lib/mysql/performance_schema/ /var/lib/mysql/sys/ /var/lib/mysql/test/"
for dir in $(ls -d /var/lib/mysql/*/) ; do
[[ $(echo ${validdirs} | grep ${dir}) ]] || exit 0
done
# we should be safe to reset dir content
# we use find as glob will ignore dot starting filename
# rm -rf /var/lib/mysql/*
find /var/lib/mysql -mindepth 1 -maxdepth 1 -print0 | xargs -0 rm -rf
exit 0

View File

@@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mysql configuration and templates.
%define name smeserver-mysql %define name smeserver-mysql
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 16 %define release 18
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@@ -37,6 +37,7 @@ Requires: MariaDB-gssapi-server
#Requires: MariaDB-compat #Requires: MariaDB-compat
Requires: mariadb-common ,mariadb-errmsg,mariadb-server-utils Requires: mariadb-common ,mariadb-errmsg,mariadb-server-utils
Requires: MariaDB-client-compat Requires: MariaDB-client-compat
Requires: MariaDB-server-compat
AutoReqProv: no AutoReqProv: no
@@ -80,6 +81,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Mon Jul 21 2025 Trevor Batley <trevor@batley.id.au> 11.0.0-18.sme
- add fix to allow upgrade of innodb to new pagesize as required by 12982 on install [SME: 13083]
* Thu Jun 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme
- fix conflict with MariaDB-server-compat [SME: 13024]
* Wed May 14 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme * Wed May 14 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme
- fix conflict with MariaDB-client-compat [SME: 13005] - fix conflict with MariaDB-client-compat [SME: 13005]