Merge lp:~percona-core/percona-server/release-5.6.20-68.0 into lp:percona-server/5.6

[Tomislav Plavcic]

Release branch for version 5.6.20-68.0

[Laurynas Biveinis (laurynas-biveinis)]

See BLD-193

review: Needs Information

[Tomislav Plavcic (tplavcic)]

From BLD-193:
Since we had PS releases on friday there was no time to make changes and test for PS (5.5/5.6) but "sed" part will not stay. So before GA I'll add our version of my.cnf and remove sed part (if there's no conclusion that this is wrong and something else needs to be done).

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog	2014-08-22 13:31:49 +0000
+++ build-ps/debian/changelog	2014-09-01 09:04:28 +0000
@@ -1,3 +1,9 @@
+percona-server-5.6 (5.6.20-rel68.0) unstable; urgency=low
+
+  * Added mysqld-debug
+
+ -- Tomislav Plavcic <[e-mail]>  Tue, 26 Aug 2014 16:18:06 +0200
+
 percona-server-5.6 (5.6.19-rel67.0) unstable; urgency=low
 
   * Fixed missing libperconaserverclient library

=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-07-01 08:43:29 +0000
+++ build-ps/percona-server.spec	2014-09-01 09:04:28 +0000
@@ -32,6 +32,18 @@
 
 #
 %bcond_with tokudb
+%bcond_with systemd
+#
+%if %{with systemd}
+  %define systemd 1
+%else
+  %if 0%{?rhel} > 6
+    %define systemd 1
+  %else
+    %define systemd 0
+  %endif
+%endif
+
 #
 %if %{with tokudb}
   %define TOKUDB_FLAGS -DWITH_VALGRIND=OFF -DUSE_VALGRIND=OFF -DDEBUG_EXTNAME=OFF -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF -DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF
@@ -204,7 +216,7 @@
   %define distro_description            Generic Linux (kernel %{generic_kernel})
   %define distro_releasetag             linux%{generic_kernel}
   %define distro_buildreq               gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel libaio-devel bison cmake
-  %define distro_requires               coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd
+  %define distro_requires               coreutils grep procps /usr/sbin/useradd /usr/sbin/groupadd
 %endif
 
 # ----------------------------------------------------------------------------
@@ -248,6 +260,9 @@
 Vendor:         %{percona_server_vendor}
 Provides:       mysql-server
 BuildRequires:  %{distro_buildreq} pam-devel openssl-devel
+%if 0%{?systemd}
+BuildRequires:  systemd
+%endif
 
 # Think about what you use here since the first step is to
 # run a rm -rf
@@ -271,6 +286,16 @@
 Summary:        Percona Server: a very fast and reliable SQL database server
 Group:          Applications/Databases
 Requires:       %{distro_requires} Percona-Server-shared%{product_suffix} Percona-Server-client%{product_suffix}
+Requires:       perl(Data::Dumper)
+%if 0%{?systemd}
+Requires(post):   systemd
+Requires(preun):  systemd
+Requires(postun): systemd
+%else
+Requires(post):   /sbin/chkconfig
+Requires(preun):  /sbin/chkconfig
+Requires(preun):  /sbin/service
+%endif
 Provides:       mysql-server MySQL-server
 Conflicts:	Percona-SQL-server-50 Percona-Server-server-51 Percona-Server-server-55
 
@@ -305,6 +330,28 @@
 %endif
 
 # ----------------------------------------------------------------------------
+%package -n Percona-Server-selinux%{product_suffix}
+Summary: 		Percona Server - Selinux policy module
+Group:          	Applications/Databases
+%if 0%{?rhel} >= 6
+BuildArch:		noarch
+%endif
+Requires:		selinux-policy
+Requires(post):		policycoreutils
+Requires(postun):	policycoreutils
+
+%if 0%{?rhel} == 6
+BuildRequires: 		selinux-policy
+%else
+BuildRequires: 		selinux-policy-devel
+%endif
+
+%description -n Percona-Server-selinux%{product_suffix}
+This package contains SELinux policy module for Percona Server package.
+
+For a description of Percona Server see http://www.percona.com/software/percona-server/
+
+# ----------------------------------------------------------------------------
 %package -n Percona-Server-client%{product_suffix}
 Summary:        Percona Server - Client
 Group:          Applications/Databases
@@ -320,6 +367,7 @@
 # ----------------------------------------------------------------------------
 %package -n Percona-Server-test%{product_suffix}
 Requires:       Percona-Server-client%{product_suffix} perl
+Requires:       perl(Socket), perl(Time::HiRes), perl(Data::Dumper), perl(Test::More)
 Summary:        Percona Server - Test suite
 Group:          Applications/Databases
 Provides:       mysql-test
@@ -505,6 +553,13 @@
 install -d $RBR%{_sbindir}
 install -d $RBR%{_libdir}/mysql/plugin
 
+# SElinux
+pushd ${MBD}/policy
+make -f /usr/share/selinux/devel/Makefile
+install -D -m 0644 $MBD/policy/percona-server.pp $RBR%{_datadir}/selinux/packages/percona-server/percona-server.pp
+popd
+# SElinux END
+
 (
   cd $MBD/release
   make DESTDIR=$RBR benchdir_root=%{_datadir} install
@@ -523,7 +578,13 @@
 
 # Install logrotate and autostart
 install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
+%if 0%{?systemd}
+install -D -m 0755 $MBD/build-ps/rpm/mysql-systemd $RBR%{_bindir}/mysql-systemd
+install -D -m 0644 $MBD/build-ps/rpm/mysql.service $RBR%{_unitdir}/mysql.service
+%else
 install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
+%endif
+
 #
 %{__rm} -f $RBR/%{_prefix}/README*
 #
@@ -551,9 +612,12 @@
   "$RBR%{_libdir}/mysql/%{malloc_lib_target}"
 %endif
 
-# Remove man pages we explicitly do not want to package, avoids 'unpackaged
+# Remove files we explicitly do not want to package, avoids 'unpackaged
 # files' warning.
 rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
+%if 0%{?systemd}
+rm -rf $RBR%{_sysconfdir}/init.d/mysql
+%endif
 
 ##############################################################################
 #  Post processing actions, i.e. when installed
@@ -561,6 +625,15 @@
 
 %pre -n Percona-Server-server%{product_suffix}
 
+# On rhel7 change default MariaDB options if they exists (only on initial installation)
+%if "%rhel" > "6"
+if [ $1 -eq 1 -a -f /etc/my.cnf ]; then
+  sed -i 's/log-error=\/var\/log\/mariadb\/mariadb.log/log-error=\/var\/log\/mysqld.log/g' /etc/my.cnf;
+  sed -i 's/pid-file=\/var\/run\/mariadb\/mariadb.pid/pid-file=\/var\/run\/mysqld\/mysqld.pid/g' /etc/my.cnf;
+  sed -i 's/\!includedir \/etc\/my.cnf.d/\#\!includedir \/etc\/my.cnf.d/g' /etc/my.cnf;
+fi
+%endif
+
 # ATTENTION: Parts of this are duplicated in the "triggerpostun" !
 
 # There are users who deviate from the default file system layout.
@@ -716,11 +789,31 @@
 # Note we *could* make that depend on $SERVER_TO_START, but we rather don't,
 # so a "stop" is attempted even if there is no PID file.
 # (Maybe the "stop" doesn't work then, but we might fix that in itself.)
+%if 0%{?systemd}
+SYSD_ACTIVE=$(systemctl is-active mysql)
+if [ $SYSD_ACTIVE == "active" ] ; then
+	%{_bindir}/systemctl stop mysql >/dev/null 2>&1
+	echo "Giving mysqld 5 seconds to exit nicely"
+	sleep 5
+fi
+%else
 if [ -x %{_sysconfdir}/init.d/mysql ] ; then
         %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1
         echo "Giving mysqld 5 seconds to exit nicely"
         sleep 5
 fi
+%endif
+
+# SElinux
+%post -n Percona-Server-selinux%{product_suffix}
+/usr/sbin/semodule -i %{_datadir}/selinux/packages/percona-server/percona-server.pp >/dev/null 2>&1 || :
+
+%postun -n Percona-Server-selinux%{product_suffix}
+if [ $1 -eq 0 ] ; then
+    /usr/sbin/semodule -r percona-server >/dev/null 2>&1 || :
+fi
+
+#SElinux
 
 %post -n Percona-Server-server%{product_suffix}
 
@@ -757,12 +850,18 @@
 # NOTE: This still needs to be debated. Should we check whether these links
 # for the other run levels exist(ed) before the upgrade?
 # use chkconfig on Enterprise Linux and newer SuSE releases
+%if 0%{?systemd}
+if [ -x %{_bindir}/systemctl ] ; then
+	%{_bindir}/systemctl enable mysql >/dev/null 2>&1
+fi
+%else
 if [ -x /sbin/chkconfig ] ; then
         /sbin/chkconfig --add mysql
 # use insserv for older SuSE Linux versions
 elif [ -x /sbin/insserv ] ; then
         /sbin/insserv %{_sysconfdir}/init.d/mysql
 fi
+%endif
 
 # ----------------------------------------------------------------------
 # Create a MySQL user and group. Do not report any problems if it already
@@ -822,12 +921,18 @@
 
 # Was the server running before the upgrade? If so, restart the new one.
 if [ "$SERVER_TO_START" = "true" ] ; then
+%if 0%{?systemd}
+if [ -x %{_bindir}/systemctl ] ; then
+	%{_bindir}/systemctl start mysql
+fi
+%else
 	# Restart in the same way that mysqld will be started normally.
 	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
 		%{_sysconfdir}/init.d/mysql start
-		echo "Giving mysqld 5 seconds to start"
-		sleep 5
 	fi
+%endif
+  echo "Giving mysqld 5 seconds to start"
+  sleep 5
 fi
 
 echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit."
@@ -862,8 +967,14 @@
 #   Remove last version of package   0 "
 #
 #  http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s04s05.html
- 
+
 if [ $1 = 0 ] ; then
+%if 0%{?systemd}
+	if [ -x %{_bindir}/systemctl ] ; then
+		%{_bindir}/systemctl stop mysql > /dev/null
+		%{_bindir}/systemctl disable mysql > /dev/null
+	fi
+%else
         # Stop MySQL before uninstalling it
         if [ -x %{_sysconfdir}/init.d/mysql ] ; then
                 %{_sysconfdir}/init.d/mysql stop > /dev/null
@@ -876,6 +987,7 @@
                         /sbin/insserv -r %{_sysconfdir}/init.d/mysql
                 fi
         fi
+%endif
 fi
 
 # We do not remove the mysql user since it may still own a lot of
@@ -918,21 +1030,35 @@
 fi
 echo "Analyzed: SERVER_TO_START=$SERVER_TO_START"
 
+%if 0%{?systemd}
+if [ -x %{_bindir}/systemctl ] ; then
+	%{_bindir}/systemctl enable mysql >/dev/null 2>&1
+fi
+%else
 if [ -x /sbin/chkconfig ] ; then
         /sbin/chkconfig --add mysql
 # use insserv for older SuSE Linux versions
 elif [ -x /sbin/insserv ] ; then
         /sbin/insserv %{_sysconfdir}/init.d/mysql
 fi
+%endif
 
 # Was the server running before the upgrade? If so, restart the new one.
 if [ "$SERVER_TO_START" = "true" ] ; then
-	# Restart in the same way that mysqld will be started normally.
+# Restart in the same way that mysqld will be started normally.
+%if 0%{?systemd}
+	if [ -x %{_bindir}/systemctl ] ; then 
+		%{_bindir}/systemctl start mysql
+		echo "Giving mysqld 5 seconds to start"
+		sleep 5
+	fi
+%else
 	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
 		%{_sysconfdir}/init.d/mysql start
 		echo "Giving mysqld 5 seconds to start"
 		sleep 5
 	fi
+%endif
 fi
 
 echo "Trigger 'postun --community' finished at `date`"        >> $STATUS_HISTORY
@@ -975,6 +1101,10 @@
 #  Files section
 ##############################################################################
 
+%files -n Percona-Server-selinux%{product_suffix}
+%dir %attr(755, root, root) %{_datadir}/selinux/packages/percona-server
+%attr(644, root, root) %{_datadir}/selinux/packages/percona-server/percona-server.pp
+
 %files -n Percona-Server-server%{product_suffix}
 %defattr(-,root,root,0755)
 
@@ -1043,6 +1173,9 @@
 %attr(755, root, root) %{_bindir}/replace
 %attr(755, root, root) %{_bindir}/resolve_stack_dump
 %attr(755, root, root) %{_bindir}/resolveip
+%if 0%{?systemd}
+%attr(755, root, root) %{_bindir}/mysql-systemd
+%endif
 
 %attr(755, root, root) %{_sbindir}/mysqld
 %attr(755, root, root) %{_sbindir}/mysqld-debug
@@ -1105,7 +1238,11 @@
 %endif
 
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
+%if 0%{?systemd}
+%attr(644, root, root) %{_unitdir}/mysql.service
+%else
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
+%endif
 
 # %attr(755, root, root) %{_datadir}/percona-server/
 %attr(755, root, root) %{_datadir}/percona-server/binary-configure
@@ -1246,6 +1383,10 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
 
 %changelog
+* Tue Aug 26 2014 Tomislav Plavcic <[e-mail]>
+
+- Added support for centos7
+
 * Mon May 26 2014 Tomislav Plavcic <[e-mail]>
 
 - Added packaging changes regarding TokuDB

=== added directory 'build-ps/rpm'
=== added file 'build-ps/rpm/mysql-systemd'
--- build-ps/rpm/mysql-systemd	1970-01-01 00:00:00 +0000
+++ build-ps/rpm/mysql-systemd	2014-09-01 09:04:28 +0000
@@ -0,0 +1,92 @@
+#! /bin/bash
+#
+# Scripts to run by Percona Server systemd service
+# 
+# Needed argument: pre | post
+# 
+# pre mode  :  try to run mysql_install_db and fix perms and SELinux contexts
+# post mode :  ping server until answer is received
+# 
+
+parse_cnf()
+{
+    local var=$1
+    shift
+    local groups=$*
+    reval=$(my_print_defaults $groups | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2- | tail -n 1 )
+    if [[ -z ${reval:-} ]];then 
+        reval=""
+    fi
+    echo $reval
+}
+
+install_db () {    
+    # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
+    log=$(parse_cnf log-error server mysqld mysqld_safe)
+    datadir=$(parse_cnf datadir server mysqld)
+    if [[ -z ${datadir:-} ]]; then
+        datadir="/var/lib/mysql"
+    fi
+
+    # Check that pid-file directory exists and has valid permissions
+    pid_path=$(parse_cnf pid-file server mysqld mysqld_safe)
+    if [[ -z "${pid_path:-}" ]]; then
+      pid_path=$datadir/`hostname`.pid
+    else
+      case "$pid_path" in
+        /* ) ;;
+        * )  pid_path="$datadir/$pid_path" ;;
+      esac
+    fi
+    pidfiledir=$(dirname $pid_path)
+
+    if [ ! -z $pidfiledir ]; then
+        [ -d "$pidfiledir" ] || install -d -m 0755 -omysql -gmysql "$pidfiledir" || exit 1
+    fi
+    
+    # Restore log, dir, perms and SELinux contexts
+    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    if [ -x /usr/sbin/restorecon ]; then
+        /usr/sbin/restorecon "$datadir"
+        if [ ! -z $pidfiledir ]; then
+            /usr/sbin/restorecon "$pidfiledir"
+        fi
+    fi
+
+    # If log file is not specified it's put into datadir by default
+    if [ ! -z $log ]; then
+        [ -e $log ] || touch $log
+        chmod 0640 $log
+        chown mysql:mysql $log || exit 1
+        if [ -x /usr/sbin/restorecon ]; then
+            /usr/sbin/restorecon $log
+        fi
+    fi
+
+    # If special mysql dir is in place, skip db install 
+    [ -d "$datadir/mysql" ] && exit 0
+
+    # Create initial db
+    /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
+    exit 0
+}
+
+pinger () {
+    # Wait for ping to answer to signal startup completed,
+    # might take a while in case of e.g. crash recovery
+    # MySQL systemd service will timeout script if no answer
+    while /bin/true ; do
+        sleep 1
+        mysqladmin ping >/dev/null 2>&1 && break
+    done
+    exit 0
+}
+
+# main
+case $1 in
+    "pre") install_db ;;
+    "post") pinger ;;
+esac
+
+exit 0
+

=== added file 'build-ps/rpm/mysql.service'
--- build-ps/rpm/mysql.service	1970-01-01 00:00:00 +0000
+++ build-ps/rpm/mysql.service	2014-09-01 09:04:28 +0000
@@ -0,0 +1,31 @@
+#
+# Systemd service file for Percona Server
+#
+# # This service file is to start PS just with mysqld_safe
+#
+
+[Unit]
+Description=MySQL Percona Server
+After=network.target
+After=syslog.target
+
+[Install]
+WantedBy=multi-user.target
+Alias=mysql.service
+
+[Service]
+# Needed to create system tables etc.
+ExecStartPre=/usr/bin/mysql-systemd pre
+
+# Start main service
+ExecStart=/usr/bin/mysqld_safe
+
+# Don't signal startup success before a ping works
+ExecStartPost=/usr/bin/mysql-systemd post
+
+# Give up if ping don't get an answer
+TimeoutSec=600
+
+Restart=always
+PrivateTmp=false
+

=== modified file 'policy/selinux/percona-server.te'
--- policy/selinux/percona-server.te	2013-03-01 19:17:07 +0000
+++ policy/selinux/percona-server.te	2014-09-01 09:04:28 +0000
@@ -11,8 +11,9 @@
         class sock_file { getattr unlink create };
         class capability { sys_nice sys_resource };
         class blk_file { read write open };
-        class file { write getattr read create unlink open };
+        class file { append write getattr read create unlink open setattr };
         class dir { search read write remove_name open add_name };
+        class process { siginh noatsecure rlimitinh };
 }
 
 #============= mysqld_safe_t ==============
@@ -22,6 +23,9 @@
 allow mysqld_safe_t tmp_t:sock_file { getattr unlink };
 allow mysqld_safe_t user_tmp_t:sock_file { getattr unlink };
 
+#!!!! This avc has a dontaudit rule in the current policy
+allow mysqld_safe_t mysqld_t:process { siginh rlimitinh noatsecure };
+
 #============= mysqld_t ==============
 allow mysqld_t fixed_disk_device_t:blk_file { read write open };
 allow mysqld_t tmp_t:sock_file { create unlink };

=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-08-22 13:31:49 +0000
+++ storage/innobase/include/univ.i	2014-09-01 09:04:28 +0000
@@ -47,7 +47,7 @@
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 67.0
+#define PERCONA_INNODB_VERSION 68.0
 #endif
 
 /* Enable UNIV_LOG_ARCHIVE in XtraDB */