parent
921725f94f
commit
10402ba1d7
56
mariadb-example-config-files.patch
Normal file
56
mariadb-example-config-files.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
diff -Naurp mariadb-10.1.19/support-files/my-huge.cnf.sh mariadb-10.1.19-patched/support-files/my-huge.cnf.sh
|
||||||
|
--- mariadb-10.1.19/support-files/my-huge.cnf.sh 2016-11-04 12:15:54.000000000 +0100
|
||||||
|
+++ mariadb-10.1.19-patched/support-files/my-huge.cnf.sh 2016-12-02 10:29:41.111798361 +0100
|
||||||
|
@@ -25,6 +25,7 @@ socket = @MYSQL_UNIX_ADDR@
|
||||||
|
|
||||||
|
# The MySQL server
|
||||||
|
[mysqld]
|
||||||
|
+log-error = @LOG_LOCATION@
|
||||||
|
port = @MYSQL_TCP_PORT@
|
||||||
|
socket = @MYSQL_UNIX_ADDR@
|
||||||
|
skip-external-locking
|
||||||
|
diff -Naurp mariadb-10.1.19/support-files/my-innodb-heavy-4G.cnf.sh mariadb-10.1.19-patched/support-files/my-innodb-heavy-4G.cnf.sh
|
||||||
|
--- mariadb-10.1.19/support-files/my-innodb-heavy-4G.cnf.sh 2016-11-04 12:15:54.000000000 +0100
|
||||||
|
+++ mariadb-10.1.19-patched/support-files/my-innodb-heavy-4G.cnf.sh 2016-12-02 10:30:07.647805999 +0100
|
||||||
|
@@ -42,7 +42,7 @@ socket = @MYSQL_UNIX_ADDR@
|
||||||
|
# The MariaDB server
|
||||||
|
#
|
||||||
|
[mysqld]
|
||||||
|
-
|
||||||
|
+log-error = @LOG_LOCATION@
|
||||||
|
# generic configuration options
|
||||||
|
port = @MYSQL_TCP_PORT@
|
||||||
|
socket = @MYSQL_UNIX_ADDR@
|
||||||
|
diff -Naurp mariadb-10.1.19/support-files/my-large.cnf.sh mariadb-10.1.19-patched/support-files/my-large.cnf.sh
|
||||||
|
--- mariadb-10.1.19/support-files/my-large.cnf.sh 2016-11-04 12:15:54.000000000 +0100
|
||||||
|
+++ mariadb-10.1.19-patched/support-files/my-large.cnf.sh 2016-12-02 10:30:14.744806845 +0100
|
||||||
|
@@ -25,6 +25,7 @@ socket = @MYSQL_UNIX_ADDR@
|
||||||
|
|
||||||
|
# The MariaDB server
|
||||||
|
[mysqld]
|
||||||
|
+log-error = @LOG_LOCATION@
|
||||||
|
port = @MYSQL_TCP_PORT@
|
||||||
|
socket = @MYSQL_UNIX_ADDR@
|
||||||
|
skip-external-locking
|
||||||
|
diff -Naurp mariadb-10.1.19/support-files/my-medium.cnf.sh mariadb-10.1.19-patched/support-files/my-medium.cnf.sh
|
||||||
|
--- mariadb-10.1.19/support-files/my-medium.cnf.sh 2016-11-04 12:15:54.000000000 +0100
|
||||||
|
+++ mariadb-10.1.19-patched/support-files/my-medium.cnf.sh 2016-12-02 10:30:21.726807677 +0100
|
||||||
|
@@ -26,6 +26,7 @@ socket = @MYSQL_UNIX_ADDR@
|
||||||
|
|
||||||
|
# The MariaDB server
|
||||||
|
[mysqld]
|
||||||
|
+log-error = @LOG_LOCATION@
|
||||||
|
port = @MYSQL_TCP_PORT@
|
||||||
|
socket = @MYSQL_UNIX_ADDR@
|
||||||
|
skip-external-locking
|
||||||
|
diff -Naurp mariadb-10.1.19/support-files/my-small.cnf.sh mariadb-10.1.19-patched/support-files/my-small.cnf.sh
|
||||||
|
--- mariadb-10.1.19/support-files/my-small.cnf.sh 2016-11-04 12:15:54.000000000 +0100
|
||||||
|
+++ mariadb-10.1.19-patched/support-files/my-small.cnf.sh 2016-12-02 10:30:27.988808423 +0100
|
||||||
|
@@ -24,6 +24,7 @@ socket = @MYSQL_UNIX_ADDR@
|
||||||
|
|
||||||
|
# The MySQL server
|
||||||
|
[mysqld]
|
||||||
|
+log-error = @LOG_LOCATION@
|
||||||
|
port = @MYSQL_TCP_PORT@
|
||||||
|
socket = @MYSQL_UNIX_ADDR@
|
||||||
|
skip-external-locking
|
@ -170,6 +170,7 @@ Patch8: %{pkgnamepatch}-install-db-sharedir.patch
|
|||||||
Patch9: %{pkgnamepatch}-ownsetup.patch
|
Patch9: %{pkgnamepatch}-ownsetup.patch
|
||||||
Patch12: %{pkgnamepatch}-admincrash.patch
|
Patch12: %{pkgnamepatch}-admincrash.patch
|
||||||
Patch13: %{pkgnamepatch}-ssl-cypher.patch
|
Patch13: %{pkgnamepatch}-ssl-cypher.patch
|
||||||
|
Patch14: %{pkgnamepatch}-example-config-files.patch
|
||||||
|
|
||||||
# Patches specific for this mysql package
|
# Patches specific for this mysql package
|
||||||
Patch30: %{pkgnamepatch}-errno.patch
|
Patch30: %{pkgnamepatch}-errno.patch
|
||||||
@ -578,6 +579,7 @@ MariaDB is a community developed branch of MySQL.
|
|||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch12 -p1
|
%patch12 -p1
|
||||||
%patch13 -p1
|
%patch13 -p1
|
||||||
|
%patch14 -p1
|
||||||
%patch30 -p1
|
%patch30 -p1
|
||||||
%patch31 -p1
|
%patch31 -p1
|
||||||
%patch32 -p1
|
%patch32 -p1
|
||||||
@ -880,9 +882,6 @@ mv Docs/README-wsrep Docs/README.wsrep
|
|||||||
# remove *.jar file from mysql-test
|
# remove *.jar file from mysql-test
|
||||||
rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar
|
rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar
|
||||||
|
|
||||||
#
|
|
||||||
echo -e "\n\nlog-error=/var/log/mariadb/mariadb.log\n" | tee -a %{buildroot}/usr/share/mariadb/*.cnf
|
|
||||||
|
|
||||||
%if %{without clibrary}
|
%if %{without clibrary}
|
||||||
unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so
|
unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so
|
||||||
unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so
|
unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so
|
||||||
@ -1338,6 +1337,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 02 2016 Michal Schorm <mschorm@redhat.com> - 3:10.1.19-6
|
||||||
|
- Move patch from specfile to standalone patch file
|
||||||
|
Related: #1382988
|
||||||
|
|
||||||
* Thu Dec 01 2016 Rex Dieter <rdieter@fedoraproject.org> - 3:10.1.19-6
|
* Thu Dec 01 2016 Rex Dieter <rdieter@fedoraproject.org> - 3:10.1.19-6
|
||||||
- -devel: use pkgconfig(openssl) to allow any implementation (like compat-openssl10)
|
- -devel: use pkgconfig(openssl) to allow any implementation (like compat-openssl10)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user