rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

merge

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=134
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2013-08-30 09:26:18 +00:00 committed by Git OBS Bridge
parent 08c02b54f5
commit 9e2f158d0c
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration-tweaks.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a5824b02d7cfe00333ac4adfec1856311fd27fafea7affc1656c5543a44db4a6 oid sha256:86e1bfe8b10e10548aa46c47b28d8bf85dcce2d7e65078f6e449d52a2d4f0bd1
size 318 size 311

2
install.inc
View File

@ -145,7 +145,9 @@ fi
rm -rf '%buildroot'/etc/my.cnf.d rm -rf '%buildroot'/etc/my.cnf.d
mkdir -p '%buildroot'/etc/my.cnf.d mkdir -p '%buildroot'/etc/my.cnf.d
bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/my.cnf.d -xvf - bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/my.cnf.d -xvf -
%if %have_info < 1
[ -z "`ls '%buildroot'/usr/share/info/mysql.info* 2> /dev/null`" ] || rm -f '%buildroot'/usr/share/info/mysql.info* [ -z "`ls '%buildroot'/usr/share/info/mysql.info* 2> /dev/null`" ] || rm -f '%buildroot'/usr/share/info/mysql.info*
%endif
if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
echo '%%dir %%_libdir/mysql' >> mysql-client.files echo '%%dir %%_libdir/mysql' >> mysql-client.files
echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files

20
mariadb.spec
View File

@ -16,9 +16,10 @@
# #
# Few definitions which will alter build # Few definitions which will alter build
%define prefered 1 %define prefered 01
%define use_cmake 1 %define use_cmake 01
%define cluster 0 %define cluster 00
%define have_info 0
%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
%define use_extra_provides 1 %define use_extra_provides 1
%define extra_provides mariadb_55 %define extra_provides mariadb_55
@ -54,6 +55,9 @@ Source14: my.ini
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} %if 0%{?suse_version}
PreReq: pwdutils PreReq: pwdutils
%if %have_info
PreReq: %install_info_prereq %insserv_prereq
%endif
%endif %endif
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -445,6 +449,10 @@ if posix.access("/usr/sbin/rcmysql", "x") then
end end
%posttrans %posttrans
%if %have_info
[ -z "`ls %{_infodir}/mysql.info.* 2> /dev/null`" ] || \
%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.*
%endif
if [ -d /var/lib/mysql ]; then if [ -d /var/lib/mysql ]; then
touch /var/lib/mysql/.run-mysql_upgrade touch /var/lib/mysql/.run-mysql_upgrade
chown -R --no-dereference mysql:mysql /var/lib/mysql chown -R --no-dereference mysql:mysql /var/lib/mysql
@ -484,6 +492,9 @@ fi
%postun %postun
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
%if %have_info
%install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.*
%endif
%{insserv_cleanup} %{insserv_cleanup}
rm -f "/var/lib/systemd/migrated/mysql.service" rm -f "/var/lib/systemd/migrated/mysql.service"
if [ -x /usr/bin/systemctl ]; then if [ -x /usr/bin/systemctl ]; then
@ -502,6 +513,9 @@ fi
%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf.d/* %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf.d/*
%config /etc/logrotate.d/mysql %config /etc/logrotate.d/mysql
%doc %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}
%if %have_info
%doc %{_infodir}/mysql.info.*
%endif
/etc/init.d/mysql /etc/init.d/mysql
/usr/sbin/rcmysql /usr/sbin/rcmysql
%dir /usr/share/%{name} %dir /usr/share/%{name}

1
my.ini
View File

@ -98,6 +98,5 @@ log = /var/log/mysqld_multi.log
# socket = /var/lib/mysql-databases/mysqld6/mysql.sock # socket = /var/lib/mysql-databases/mysqld6/mysql.sock
# user = mysql # user = mysql
!includedir /etc/mysql
!includedir /etc/my.cnf.d !includedir /etc/my.cnf.d

4
mysql-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:166945cf5ab12a72f10c01211781dc3da69d71e6d24e55756220d2865af8654e oid sha256:d3d3c1953efc32f5010b3dc1ba1eaa3ae1ad12bde4220f24c267ee33ab1bbdce
size 13346 size 13333

3
rc.mysql-multi
View File

@ -334,7 +334,7 @@ else
chown -R --no-dereference mysql:mysql "$log_dir" chown -R --no-dereference mysql:mysql "$log_dir"
done done
MYSQLVER="`mysqld --version | sed 's|.*Ver\ *\([^\ ]*\)\.[0-9]\+[\-\ ].*|\1|'`" MYSQLVER="`mysqld --no-defaults --version | sed 's|.*Ver\ *\([^\ ]*\)\.[0-9]\+[\-\ ].*|\1|'`"
# We assume a fresh install if the directory $datadir/mysql # We assume a fresh install if the directory $datadir/mysql
# does not exist and create the privilege database # does not exist and create the privilege database
@ -351,6 +351,7 @@ else
# user confirmation. # user confirmation.
if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then
if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \ if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \
[ -f "$datadir/mysql_upgrade_info" ] && \
[ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then [ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then
echo echo
echo "You are upgrading from different stable version of MySQL!" echo "You are upgrading from different stable version of MySQL!"