Skip to content

Commit 2812bc9

Browse files
bjornmubjornmu
committed
Merge from 5.7.4-m14-release
2 parents 6662d42 + a9800d0 commit 2812bc9

File tree

3 files changed

+59
-15
lines changed

3 files changed

+59
-15
lines changed

‎packaging/rpm-fedora/mysql.spec.in

+6-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Name: mysql-%{product_suffix}
6363
Summary: A very fast and reliable SQL database server
6464
Group: Applications/Databases
6565
Version: @MYSQL_NO_DASH_VERSION@
66-
Release: 0.1%{?milestone:.%{milestone}}%{?dist}
66+
Release: 0.2%{?milestone:.%{milestone}}%{?dist}
6767
License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
6868
Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
6969
URL: http://www.mysql.com/
@@ -535,6 +535,7 @@ fi
535535
%dir %{_libdir}/mysql/plugin
536536
%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
537537
%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
538+
%attr(755, root, root) %{_libdir}/mysql/plugin/ha_example.so
538539
%attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so
539540
%attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so
540541
%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
@@ -544,6 +545,7 @@ fi
544545
%dir %{_libdir}/mysql/plugin/debug
545546
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
546547
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
548+
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/ha_example.so
547549
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/innodb_engine.so
548550
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmemcached.so
549551
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
@@ -690,6 +692,9 @@ fi
690692
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
691693

692694
%changelog
695+
* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.2.m14
696+
- Add ha_example.so plugin which is now included
697+
693698
* Fri Feb 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.1.m14
694699
- 5.7.4
695700
- Enable shared libmysqld by cmake option

‎packaging/rpm-oel/mysql.spec.in

+51-3
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Name: mysql-%{product_suffix}
8888
Summary: A very fast and reliable SQL database server
8989
Group: Applications/Databases
9090
Version: @MYSQL_NO_DASH_VERSION@
91-
Release: 0.1%{?milestone:.%{milestone}}%{?dist}
91+
Release: 0.3%{?milestone:.%{milestone}}%{?dist}
9292
License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
9393
Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
9494
URL: http://www.mysql.com/
@@ -208,10 +208,12 @@ Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
208208
%else
209209
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
210210
%endif
211-
Obsoletes: mysql < %{version}-%{release}
212211
Obsoletes: mariadb
212+
%if 0%{?rhel} > 5
213+
Obsoletes: mysql < %{version}-%{release}
213214
Provides: mysql = %{version}-%{release}
214215
Provides: mysql%{?_isa} = %{version}-%{release}
216+
%endif
215217

216218
%description client
217219
This package contains the standard MySQL clients and administration
@@ -294,6 +296,15 @@ Group: Applications/Databases
294296
Obsoletes: mysql-libs-compat < %{version}-%{release}
295297
Provides: mysql-libs-compat = %{version}-%{release}
296298
Provides: mysql-libs-compat%{?_isa} = %{version}-%{release}
299+
%if 0%{?commercial}
300+
Obsoletes: mysql-community-libs-compat < %{version}-%{release}
301+
Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
302+
%else
303+
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
304+
%endif
305+
%if 0%{?rhel} > 5
306+
Obsoletes: mysql-libs < %{version}-%{release}
307+
%endif
297308

298309
%description libs-compat
299310
This package contains the shared compat libraries for MySQL %{compatver} client
@@ -341,9 +352,31 @@ Provides: mysql-embedded-devel = %{version}-%{release}
341352
Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release}
342353

343354
%description embedded-devel
344-
This package contains files needed for developing applicatison using
355+
This package contains files needed for developing applications using
345356
the embedded version of the MySQL server.
346357

358+
%if 0%{?rhel} == 5
359+
%package -n mysql
360+
Summary: Convenience package for easy upgrades of MySQL package set
361+
Group: Applications/Databases
362+
%if 0%{?commercial}
363+
Requires: mysql-enterprise-client%{?_isa} = %{version}-%{release}
364+
Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
365+
Requires: mysql-enterprise-libs-compat%{?_isa} = %{version}-%{release}
366+
%else
367+
Requires: mysql-community-client%{?_isa} = %{version}-%{release}
368+
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
369+
Requires: mysql-community-libs-compat%{?_isa} = %{version}-%{release}
370+
%endif
371+
372+
%description -n mysql
373+
This package has as sole purpose to require other MySQL packages such
374+
that upgrades will be more convenient.
375+
376+
Technical background: this is done to reflect the fact that mysql
377+
package has been split into several subpackages.
378+
%endif
379+
347380
%prep
348381
%if 0%{?compatlib}
349382
%setup -q -T -a 0 -a 7 -c -n %{src_dir}
@@ -642,6 +675,7 @@ fi
642675
%dir %{_libdir}/mysql/plugin
643676
%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
644677
%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
678+
%attr(755, root, root) %{_libdir}/mysql/plugin/ha_example.so
645679
%attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so
646680
%attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so
647681
%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
@@ -651,6 +685,7 @@ fi
651685
%dir %{_libdir}/mysql/plugin/debug
652686
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
653687
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
688+
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/ha_example.so
654689
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/innodb_engine.so
655690
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmemcached.so
656691
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
@@ -808,7 +843,20 @@ fi
808843
%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
809844
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
810845

846+
%if 0%{?rhel} == 5
847+
%files -n mysql
848+
%defattr(-, root, root, -)
849+
%doc %{?license_files_server}
850+
%endif
851+
811852
%changelog
853+
* Wed Mar 12 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.3.m14
854+
- Resolve conflict with mysql-libs-compat
855+
856+
* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.2.m14
857+
- Resolve conflict issues during upgrade
858+
- Add ha_example.so plugin which is now included
859+
812860
* Fri Feb 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.1.m14
813861
- 5.7.4
814862
- Enable shared libmysqld by cmake option

‎scripts/mysql_install_db.pl.in

+2-11
Original file line numberDiff line numberDiff line change
@@ -323,17 +323,8 @@ my $password;
323323
my $escaped_password; # the password, with special characters escaped
324324

325325
sub ensure_secret_file {
326-
if ( exists $ENV{HOME} ) {
327-
$secret_file = $ENV{HOME} . "/.mysql_secret";
328-
} elsif ( -d "/root" ) {
329-
# If we don't have any environment this might be because we're
330-
# running as a service script. Assume the user is root and that he has
331-
# a standard root account.
332-
$secret_file= "/root/.mysql_secret";
333-
} else
334-
{
335-
die "ERROR: Found no /root home directory. Please create one.";
336-
}
326+
my $home = (getpwuid($>))[7];
327+
$secret_file = $home . "/.mysql_secret";
337328

338329
# Create safe files to avoid leaking info to other users
339330
# Loop may be extended if we need more ...

0 commit comments

Comments
 (0)