[packages/mysql] - rel 2; drop our local mysql-client.conf hack and instead provide symlink from my.cnf (which is rea
arekm
arekm at pld-linux.org
Wed Jul 17 11:30:12 CEST 2013
commit 49e27b83201885fef0fc00f73957c24526c68fb9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jul 17 11:30:07 2013 +0200
- rel 2; drop our local mysql-client.conf hack and instead provide symlink from my.cnf (which is read by mysql anyway) to get similar behaviour as our hack was doing
mysql-client-config.patch | 10 ----------
mysql.spec | 6 +++---
2 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 1f9ca43..ddbf701 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -35,7 +35,7 @@ Summary(uk.UTF-8): MySQL - швидкий SQL-сервер
Summary(zh_CN.UTF-8): MySQL数据库服务器
Name: mysql
Version: 5.5.32
-Release: 1
+Release: 2
License: GPL + MySQL FLOSS Exception
Group: Applications/Databases
# Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
@@ -65,7 +65,6 @@ Patch3: bug-67402.patch
# from fedora
Patch6: %{name}-system-users.patch
-Patch8: %{name}-client-config.patch
Patch9: %{name}-build.patch
Patch11: %{name}-upgrade.patch
Patch12: %{name}-config.patch
@@ -497,7 +496,6 @@ mv sphinx-*/mysqlse storage/sphinx
%patch6 -p1
-%patch8 -p1
%patch9 -p1
%patch11 -p1
%patch12 -p1
@@ -596,6 +594,7 @@ awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.
cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.conf
cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/mysql-client.conf
+ln -s mysql-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/my.cnf
cp -a %{SOURCE14} $RPM_BUILD_ROOT/etc/skel/.my.cnf
# NDB
@@ -1035,6 +1034,7 @@ done
%defattr(644,root,root,755)
%attr(751,root,root) %dir %{_sysconfdir}/mysql
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mysql-client.conf
+%{_sysconfdir}/%{name}/my.cnf
%attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.18
%attr(755,root,root) %{_libdir}/libmysqlclient_r.so.*.*.*
diff --git a/mysql-client-config.patch b/mysql-client-config.patch
deleted file mode 100644
index 5f56e98..0000000
--- a/mysql-client-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysql-5.1.6-alpha/sql-common/client.c~ 2006-02-21 16:09:34.000000000 +0200
-+++ mysql-5.1.6-alpha/sql-common/client.c 2006-02-21 16:14:10.000000000 +0200
-@@ -1456,6 +1456,7 @@
-
- mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
- mysql->options.report_data_truncation= TRUE; /* default */
-+ mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-
- /*
- By default we don't reconnect because it could silently corrupt data (after
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/49e27b83201885fef0fc00f73957c24526c68fb9
More information about the pld-cvs-commit
mailing list