Merge lp:~ignacio-nin/percona-server/5.6-bug1079688 into lp:percona-server/5.6

[Ignacio Nin]

Fix for bug #1079688

We're also piggybacking a fix to the build/ directory that introduced some issues after revno 349 (part of The Merge). This fix is to return some files to its pre-349 (correct) status.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== removed file 'build/build-shared-compat-rpm.sh'
--- build/build-shared-compat-rpm.sh	2013-05-12 09:21:34 +0000
+++ build/build-shared-compat-rpm.sh	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-#!/bin/sh
-#
-# Execute this tool to setup and build the shared-compat RPM starting
-# from a fresh tree
-#
-# Usage: build-shared-compat-rpm.sh [target dir]
-# The default target directory is the current directory. If it is not
-# supplied and the current directory is not empty, it will issue an error in
-# order to avoid polluting the current directory after a test run.
-#
-# The program will setup the rpm building environment, download the sources
-# and ultimately call rpmbuild with the appropiate parameters.
-#
-
-# Bail out on errors, be strict
-set -ue
-
-# Examine parameters
-TARGET=''
-TARGET_ARG=''
-TARGET_CFLAGS=''
-SIGN='--sign'
-
-# Check if we have a functional getopt(1)
-if ! getopt --test
-then
-    go_out="$(getopt --options="iK" --longoptions=i686,nosign \
-        --name="$(basename "$0")" -- "$@")"
-    test $? -eq 0 || exit 1
-    eval set -- $go_out
-fi
-
-for arg
-do
-    case "$arg" in
-    -- ) shift; break;;
-    -i | --i686 )
-        shift
-        TARGET='i686'
-        TARGET_ARG="--target i686"
-        TARGET_CFLAGS="-m32 -march=i686"
-        ;;
-    -K | --nosign )
-        shift
-        SIGN=''
-        ;;
-    esac
-done
-
-# Working directory
-if test "$#" -eq 0
-then
-    WORKDIR="$(pwd)"
-    
-    # Check that the current directory is not empty
-    if test "x$(echo *)" != "x*"
-    then
-        echo >&2 \
-            "Current directory is not empty. Use $0 . to force build in ."
-        exit 1
-    fi
-
-elif test "$#" -eq 1
-then
-    WORKDIR="$1"
-
-    # Check that the provided directory exists and is a directory
-    if ! test -d "$WORKDIR"
-    then
-        echo >&2 "$WORKDIR is not a directory"
-        exit 1
-    fi
-
-else
-    echo >&2 "Usage: $0 [target dir]"
-    exit 1
-
-fi
-
-WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
-
-# If we're in 32 bits, ensure that we're compiling for i686.
-if test "x$TARGET" == "x"
-then
-    if test "x$(uname -m)" != "xx86_64"
-    then
-        TARGET='i686'
-        TARGET_ARG="--target i686"
-        TARGET_CFLAGS='-m32 -march=i686'
-    fi
-
-fi
-
-SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
-test -e "$SOURCEDIR/Makefile" || exit 2
-
-# Extract version from the Makefile
-MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
-    | cut -d = -f 2)"
-PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
-    "$SOURCEDIR/Makefile" | cut -d = -f 2)"
-PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-
-# Extract version of the 5.1 branch, to get .so.16 from there.
-MYSQL_VERSION51="$(grep '^%define version51 ' \
-    "$SOURCEDIR/build/percona-shared-compat.spec" | cut -d ' ' -f3)"
-
-# Build information
-REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
-    cut -d ' ' -f 2)"
-REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
-
-# Compilation flags
-export CC=gcc
-export CXX=gcc
-export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer $TARGET_CFLAGS"
-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions $TARGET_CFLAGS"
-export MAKE_JFLAG=-j4
-
-# Create directories for rpmbuild if these don't exist
-(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)
-
-# Prepare sources
-(
-    cd "$WORKDIR/SOURCES/"
- 
-    # Download the sources from the community site
-    if test "x$TARGET" = "xi686"
-    then
-        RPMVER=i386
-    elif test "x$(uname -m)" = "xx86_64"
-    then
-        RPMVER=x86_64
-    else
-        RPMVER=i386
-    fi
-
-    wget -c "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
-    wget -c "http://www.percona.com/downloads/community/shared-compat/Percona-Server-shared-51-$MYSQL_VERSION51.rhel$REDHAT_RELEASE.$RPMVER.rpm"
-
-)
-
-# Issue rpmbuild command
-(
-    cd "$WORKDIR"
-
-    # Issue RPM command
-    rpmbuild -ba --clean $SIGN \
-        "$SOURCEDIR/build/percona-shared-compat.spec" \
-        --define "_topdir $WORKDIR_ABS" \
-        --define "redhat_version $REDHAT_RELEASE" \
-        --define "gotrevision $REVISION" \
-        --define "release $PERCONA_SERVER_VERSION" \
-        $TARGET_ARG
-
-)
-

=== modified file 'build/debian/libmysqlclient-dev.install'
--- build/debian/libmysqlclient-dev.install	2013-05-10 13:29:38 +0000
+++ build/debian/libmysqlclient-dev.install	2013-05-29 20:38:44 +0000
@@ -3,5 +3,4 @@
 usr/lib/libmysqlclient.a
 usr/lib/libmysqlclient_r.a
 usr/lib/libmysqlservices.a
-usr/lib/libhsclient.a
 usr/share/man/man1/mysql_config.1

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-05-13 04:25:56 +0000
+++ build/debian/rules	2013-05-29 20:38:44 +0000
@@ -56,48 +56,33 @@
 
 	# Build UDF
 	cd UDF && \
-	CXX=g++ CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/include" \
+	CXX="$${UDF_CXX:-g++}" CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/release/include" \
 		./configure --includedir=$(CURDIR)/include \
 			--libdir=$(prefix)/lib/mysql/plugin && \
 	make $(MAKE_JFLAG)
 	
-	dh_auto_test
+build:
+	dh build
 
 binary:
-	echo "Making binary"
-	dh --before dh_auto_install binary
-	dh_auto_install
-	cd UDF && make DESTDIR=$(TMP) install
-	dh --after dh_auto_install --before dh_installinit binary
-	dh_installinit --name=mysql
-	dh --after dh_installinit binary
-
+	dh -Brelease binary
 
 binary-arch:
-	echo "Making binary"
-	dh --before dh_auto_install binary-arch
-	dh_auto_install
-	cd UDF && make DESTDIR=$(TMP) install
-	dh --after dh_auto_install --before dh_installinit binary-arch
-	dh_installinit --name=mysql
-	dh --after dh_installinit binary-arch
+	dh -Brelease binary-arch
 
 binary-indep:
-	echo "Making binary"
-	dh --before dh_auto_install binary-indep
-	dh_auto_install
-	cd UDF && make DESTDIR=$(TMP) install
-	dh --after dh_auto_install --before dh_installinit binary-indep
-	dh_installinit --name=mysql
-	dh --after dh_installinit binary-indep
+	dh -Brelease binary-indep
 
 install:
-	echo "Making binary"
-	dh --before dh_auto_install install
+	dh install
+
+override_dh_auto_install:
 	dh_auto_install
 	cd UDF && make DESTDIR=$(TMP) install
-	dh --after dh_auto_install --before dh_installinit install
+
+override_dh_installinit:
 	dh_installinit --name=mysql
 
 override_dh_strip:
 	dh_strip --dbg-package=percona-server-5.6-dbg
+

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-05-26 10:55:00 +0000
+++ build/percona-server.spec	2013-05-29 20:38:44 +0000
@@ -703,26 +703,13 @@
 fi
 
 %post -n Percona-Server-server%{product_suffix}
-if [ X${PERCONA_DEBUG} == X1 ]; then
-        set -x
-fi
+
 # ATTENTION: Parts of this are duplicated in the "triggerpostun" !
 
 mysql_datadir=%{mysqldatadir}
 NEW_VERSION=%{mysql_version}-%{release}
 STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
 
-if [ $1 -eq 1 ]; then
-# ----------------------------------------------------------------------
-# Create a MySQL user and group. Do not report any problems if it already
-# exists.
-# ----------------------------------------------------------------------
-groupadd -r %{mysqld_group} 2> /dev/null || true
-useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" \
-  -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
-# The user may already exist, make sure it has the proper group nevertheless
-# (BUG#12823)
-usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
 # ----------------------------------------------------------------------
 # Create data directory if needed, check whether upgrade or install
 # ----------------------------------------------------------------------
@@ -740,11 +727,8 @@
 	# If the directory exists, we may assume it is an upgrade.
 	echo "MySQL RPM upgrade to version $NEW_VERSION" >> $STATUS_FILE
 fi
-if [ ! -d $mysql_datadir/test ]; then 
-        mkdir $mysql_datadir/test; 
-fi
-%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
-fi 
+if [ ! -d $mysql_datadir/test ] ; then mkdir $mysql_datadir/test; fi
+
 # ----------------------------------------------------------------------
 # Make MySQL start/shutdown automatically when the machine does it.
 # ----------------------------------------------------------------------
@@ -759,15 +743,33 @@
 fi
 
 # ----------------------------------------------------------------------
+# Create a MySQL user and group. Do not report any problems if it already
+# exists.
+# ----------------------------------------------------------------------
+groupadd -r %{mysqld_group} 2> /dev/null || true
+useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" \
+  -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
+# The user may already exist, make sure it has the proper group nevertheless
+# (BUG#12823)
+usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
+
+# ----------------------------------------------------------------------
+# Change permissions so that the user that will run the MySQL daemon
+# owns all database files.
+# ----------------------------------------------------------------------
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
+
+# ----------------------------------------------------------------------
 # Initiate databases if needed
 # ----------------------------------------------------------------------
+%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
+
 # ----------------------------------------------------------------------
 # Upgrade databases if needed would go here - but it cannot be automated yet
 # ----------------------------------------------------------------------
 
 # ----------------------------------------------------------------------
-# Change permissions so that the user that will run the MySQL daemon
-# owns all database files.
+# Change permissions again to fix any new files.
 # ----------------------------------------------------------------------
 chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
 
@@ -1006,7 +1008,6 @@
 %attr(755, root, root) %{_sbindir}/mysqld
 %attr(755, root, root) %{_sbindir}/mysqld-debug
 %attr(755, root, root) %{_sbindir}/rcmysql
-%attr(755, root, root) %{_bindir}/innodb_memcached_config.sql
 %attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
 %attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
@@ -1019,9 +1020,6 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/auth_pam.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/auth_pam_compat.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/dialog.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
@@ -1034,9 +1032,6 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_pam.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_pam_compat.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/dialog.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
 # UDF files
 %attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so
@@ -1107,13 +1102,12 @@
 %{_libdir}/mysql/libmysqlclient.a
 %{_libdir}/mysql/libmysqlclient_r.a
 %{_libdir}/mysql/libmysqlservices.a
-%{_libdir}/*.so
 
 # ----------------------------------------------------------------------------
 %files -n Percona-Server-shared%{product_suffix}
 %defattr(-, root, root, 0755)
 # Shared libraries (omit for architectures that don't support them)
-%{_libdir}/libmysql*.so.*
+%{_libdir}/libmysql*.so*
 # Maatkit UDF libs
 %{_libdir}/mysql/plugin/libfnv1a_udf.a
 %{_libdir}/mysql/plugin/libfnv1a_udf.la

=== removed file 'build/percona-shared-compat.spec'
--- build/percona-shared-compat.spec	2013-03-05 16:39:46 +0000
+++ build/percona-shared-compat.spec	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-#
-# percona-shared-compat.spec
-#
-# Based on MySQL-shared-compat.spec, which is Copyright (C) 2003 MySQL AB
-#
-# RPM build instructions to create a "meta" package that includes different
-# versions of the MySQL shared libraries (for compatibility with
-# distributions that ship older versions of MySQL).
-#
-# In this version we simply repackage mysql-shared-compat from upstream.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc., 59
-# Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# For 5.0 and up, this is needed because of "libndbclient".
-%define _unpackaged_files_terminate_build 0
-
-#
-# Change this to match the version of the shared libs you want to include
-#
-%define version55 5.5.29
-%define version51 5.1.66
-%define version50 5.0.91
-%define version41 4.1.22
-%define version40 4.0.27
-#%define version3 3.23.58
-
-%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
-
-Name:         Percona-Server-shared-compat
-Packager:     Percona MySQL Development Team <[e-mail]>
-Vendor:       Percona Inc
-License:      GPL v2
-Group:        Applications/Databases
-URL:          http://www.percona.com/percona-lab.html
-Autoreqprov:  on
-Version:      %{version55}
-Release:      %{release}.%{gotrevision}.rhel%{redhatversion}
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-%if "%{redhatversion}" == "5"
-Obsoletes:    MySQL-shared mysql
-%else
-Obsoletes:    MySQL-shared mysql-libs
-%endif
-Provides:     MySQL-shared mysql-libs
-Summary:      MySQL shared client libraries for MySQL %{version}, %{version50}, %{version41} and %{version40}
-
-# We extract the older libraries from mysql-shared-compat and the newer from our sources
-Source0:      MySQL-shared-compat-%{version55}-1.linux2.6.%{_arch}.rpm
-Source1:      Percona-Server-shared-51-%{version51}.rhel%{redhatversion}.%{_arch}.rpm
-#Source1:      MySQL-shared-%{version50}-1.%{_arch}.rpm
-#Source2:      MySQL-shared-%{version41}-0.%{_arch}.rpm
-#Source3:      MySQL-shared-%{version40}-0.%{_arch}.rpm
-#Source3:      MySQL-shared-%{version3}-1.%{_arch}.rpm
-# No need to include the RPMs once more - they can be downloaded seperately
-# if you want to rebuild this package
-NoSource:     0
-NoSource:     1
-#NoSource:     2
-#NoSource:     3
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-
-%description
-This package includes the shared libraries for MySQL 4.0, 4.1, 5.0 and 5.1.
-Install this package instead of "MySQL-shared", if you have applications
-installed that are dynamically linked against older versions of the MySQL
-client library but you want to upgrade to MySQL %{version} without breaking the
-library dependencies.
-
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-mkdir -p $RPM_BUILD_ROOT
-cd $RPM_BUILD_ROOT
-rpm2cpio %{SOURCE0} | cpio -iv --make-directories
-#rpm2cpio %{SOURCE1} | cpio -iv --make-directories
-#rpm2cpio %{SOURCE2} | cpio -iv --make-directories
-#rpm2cpio %{SOURCE3} | cpio -iv --make-directories
-rpm2cpio %{SOURCE1} | cpio -ivu '*/usr/lib64/libmysqlclient*so.16*'
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-
-%files
-%defattr(-, root, root)
-%{_libdir}/libmysqlclient*
-