Merge lp:~abychko/percona-server/percona-server-5.5-builds-fixed into lp:percona-server/5.5

[Alexey Bychko]

fixed build issues for 5.5

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Makefile-ps'
--- Makefile-ps	2014-02-03 04:39:37 +0000
+++ Makefile-ps	2014-02-19 12:55:31 +0000
@@ -7,13 +7,13 @@
 RELEASE_DIR ?= $(PERCONA_SERVER)-release
 SERIES ?=series
 
-CFLAGS=-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
-CXXFLAGS=-fno-exceptions -fPIC -Wall -Wno-unused-parameter -fno-implicit-templates -fno-exceptions -fno-rtti -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
+CFLAGS ?=-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
+CXXFLAGS ?=-fno-exceptions -fPIC -Wall -Wno-unused-parameter -fno-implicit-templates -fno-exceptions -fno-rtti -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
 
 CFLAGS_RELEASE=$(CFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
 CXXFLAGS_RELEASE=$(CXXFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
 
-CMAKE=CC=gcc CXX=gcc cmake $(ADDITIONAL)
+CMAKE=CC=gcc CXX=g++ cmake $(ADDITIONAL)
 ADDITIONAL ?=
 CONFIGURE=CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"  LIBS=-lrt ./configure --prefix=/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION) --with-plugin-innobase --with-plugin-partition
 
@@ -25,9 +25,9 @@
 	@echo "Percona Server source code is ready"
 	@echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
 	@echo ""
-	export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
-	export CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
-	export LIBS=-lrt
+	@echo export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
+	@echo export CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
+	@echo export LIBS=-lrt
 	@echo ""
 	@echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
 	@echo ""
 
=== modified file 'UDF/Makefile.am'
--- UDF/Makefile.am	2013-11-29 01:14:06 +0000
+++ UDF/Makefile.am	2014-02-19 12:55:31 +0000
@@ -1,3 +1,3 @@
-ACLOCAL_AMFLAGS = -Im4
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src
 
=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh	2013-12-20 02:58:23 +0000
+++ build-ps/build-binary.sh	2014-02-19 12:55:31 +0000
@@ -134,7 +134,7 @@
 then
     PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
 else
-    PROCESSORS=4
+    PROCESSORS=2
 fi
 
 # Extract version from the Makefile-ps
@@ -153,9 +153,17 @@
 
 # Compilation flags
 export CC=${CC:-gcc}
-export CXX=${CXX:-gcc}
-export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
+export CXX=${CXX:-g++}
+#
+if [ -n "$(which rpm)" ]; then
+  export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
+else
+  export COMMON_FLAGS="-O2 -g"
+fi
+#
+export CFLAGS="${COMMON_FLAGS} -static-libgcc -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
+export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
+#
 export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
 
 # Create a temporary working directory
 
=== removed file 'build-ps/build-shared-compat-rpm.sh'
--- build-ps/build-shared-compat-rpm.sh	2013-03-06 10:47:52 +0000
+++ build-ps/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-ps/debian/rules'
--- build-ps/debian/rules	2014-02-07 07:16:41 +0000
+++ build-ps/debian/rules	2014-02-19 12:55:31 +0000
@@ -61,9 +61,9 @@
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
-	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -DBIG_JOINS=1"} \
+	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
-	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti"} \
+	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-01-28 10:44:13 +0000
+++ build-ps/percona-server.spec	2014-02-19 12:55:31 +0000
@@ -25,15 +25,15 @@
 %define mysql_vendor            Oracle and/or its affiliates
 %define percona_server_vendor	Percona, Inc
 
-%define mysql_version 5.5.35
+%define mysql_version @@MYSQL_VERSION@@
 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
-%define percona_server_version 33.1
+%define percona_server_version @@PERCONA_VERSION@@
 
 %define mysqld_user     mysql
 %define mysqld_group    mysql
 %define mysqldatadir    /var/lib/mysql
 
-%define release         rel%{percona_server_version}.1%{?dist}
+%define release         rel%{percona_server_version}%{?dist}
 
 #
 # Macros we use which are not available in all supported versions of RPM
@@ -225,7 +225,6 @@
 Distribution:   %{distro_description}
 License:        Copyright (c) 2000, 2010, %{mysql_vendor}.  All rights reserved.  Use is subject to license terms.  Under %{license_type} license as shown in the Description field.
 Source:         http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-%{mysql_version}-%{percona_server_version}/source/%{src_dir}.tar.gz
-Patch1:         mysql-dubious-exports.patch
 URL:            http://www.percona.com/
 Packager:       Percona MySQL Development Team <[e-mail]>
 Vendor:         %{percona_server_vendor}
@@ -317,18 +316,17 @@
 Summary:        Percona Server - Shared libraries
 Group:          Applications/Databases
 Provides:       mysql-shared mysql-libs
-Obsoletes:      mysql-libs
 
 %description -n Percona-Server-shared%{product_suffix}
 This package contains the shared libraries (*.so*) which certain languages
 and applications need to dynamically load and use Percona Server.
 
 ##############################################################################
+#
 %prep
+#
 %setup -n %{src_dir}
 #
-%patch1 -p1 
-#
 ##############################################################################
 %build
 
@@ -366,12 +364,6 @@
 # Set environment in order of preference, MYSQL_BUILD_* first, then variable
 # name, finally a default.  RPM_OPT_FLAGS is assumed to be a part of the
 # default RPM build environment.
-#
-# We set CXX=gcc by default to support so-called 'generic' binaries, where we
-# do not have a dependancy on libgcc/libstdc++.  This only works while we do
-# not require C++ features such as exceptions, and may need to be removed at
-# a later date.
-#
 
 # This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break
 # the compile in cmd-line-utils/readline - needs investigation, but for now
@@ -423,6 +415,8 @@
            -DCMAKE_BUILD_TYPE=Debug \
            -DWITH_EMBEDDED_SERVER=OFF \
            -DWITH_SSL=system \
+           -DINSTALL_MYSQLSHAREDIR=share/percona-server \
+           -DINSTALL_SUPPORTFILESDIR=share/percona-server \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
@@ -441,6 +435,8 @@
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
            -DWITH_EMBEDDED_SERVER=OFF \
            -DWITH_SSL=system \
+           -DINSTALL_MYSQLSHAREDIR=share/percona-server \
+           -DINSTALL_SUPPORTFILESDIR=share/percona-server \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
@@ -472,39 +468,17 @@
 # Clean up the BuildRoot first
 [ "$RBR" != "/" ] && [ -d "$RBR" ] && rm -rf "$RBR";
 
-# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  This
-# needs to be during build phase as $CC is not set during install.
-if "$CC" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1
-then
-  libgcc=`$CC $CFLAGS --print-libgcc-file`
-  if [ -f $libgcc ]
-  then
-    mkdir -p $RBR%{_libdir}/mysql
-    install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
-    echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
-  fi
-fi
-
-# Move temporarily the saved files to the BUILD directory since the BUILDROOT
-# dir will be cleaned at the start of the install phase
-mkdir -p "$(dirname $RPM_BUILD_DIR/%{_libdir})"
-mv $RBR%{_libdir} $RPM_BUILD_DIR/%{_libdir}
-
 ##############################################################################
 %install
 
 RBR=$RPM_BUILD_ROOT
 MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}%{server_suffix}
 
-# Move back the libdir from BUILD dir to BUILDROOT
-mkdir -p "$(dirname $RBR%{_libdir})"
-mv $RPM_BUILD_DIR/%{_libdir} $RBR%{_libdir}
-
 # Ensure that needed directories exists
 install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
 install -d $RBR%{mysqldatadir}/mysql
 install -d $RBR%{_datadir}/mysql-test
-install -d $RBR%{_datadir}/mysql/SELinux/RHEL4
+install -d $RBR%{_datadir}/percona-server/SELinux/RHEL4
 install -d $RBR%{_includedir}
 install -d $RBR%{_libdir}
 install -d $RBR%{_mandir}
@@ -552,7 +526,7 @@
 
 # Install SELinux files in datadir
 install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \
-  $RBR%{_datadir}/mysql/SELinux/RHEL4
+  $RBR%{_datadir}/percona-server/SELinux/RHEL4
 
 %if %{WITH_TCMALLOC}
 # Even though this is a shared library, put it under /usr/lib*/mysql, so it
@@ -1093,7 +1067,7 @@
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
 
-%attr(755, root, root) %{_datadir}/mysql/
+%attr(755, root, root) %{_datadir}/percona-server/
 
 # ----------------------------------------------------------------------------
 %files -n Percona-Server-client%{product_suffix}
 
=== removed file 'build-ps/percona-shared-compat.spec'
--- build-ps/percona-shared-compat.spec	2013-12-20 02:58:23 +0000
+++ build-ps/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.33
-%define version51 5.1.70
-%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/libperconaserverclient*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}/libperconaserverclient*
-
 
=== removed directory 'build-ps/rpm'
=== removed file 'build-ps/rpm/mysql-dubious-exports.patch'
--- build-ps/rpm/mysql-dubious-exports.patch	2013-07-23 04:41:43 +0000
+++ build-ps/rpm/mysql-dubious-exports.patch	1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-Prefix mysql_ to the real names of several symbols that have to be exported
-from libperconaserverclient because mysql-connector-odbc and/or PHP depend on
-them. This limits the intrusion on application namespace.
-
-Also, remove all traces of make_scrambled_password and
-make_scrambled_password_323, so that references to these functions draw
-compile-time warnings, per a suggestion from Paul Howarth in bug #690346.
-It doesn't seem worth trying to get rid of all the internal symbols exposed
-by mysql.h, but these two are relatively easy to get rid of.
-
-
-diff -up mysql-5.5.28/client/mysqladmin.cc.p8 mysql-5.5.28/client/mysqladmin.cc
---- mysql-5.5.28/client/mysqladmin.cc.p8	2012-08-29 10:50:46.000000000 +0200
-+++ mysql-5.5.28/client/mysqladmin.cc	2012-12-06 14:16:14.598520859 +0100
-@@ -21,6 +21,7 @@
- #include <my_pthread.h>				/* because of signal()	*/
- #include <sys/stat.h>
- #include <mysql.h>
-+#include <password.h>       /* my_make_scrambled_password_323, my_make_scrambled_password */
- #include <sql_common.h>
- #include <welcome_copyright_notice.h>           /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
- 
-@@ -989,9 +990,9 @@ static int execute_commands(MYSQL *mysql
-           }
-         }
-         if (old)
--          make_scrambled_password_323(crypted_pw, typed_password);
-+          my_make_scrambled_password_323(crypted_pw, typed_password, strlen(typed_password));
-         else
--          make_scrambled_password(crypted_pw, typed_password);
-+          my_make_scrambled_password(crypted_pw, typed_password, strlen(typed_password));
-       }
-       else
- 	crypted_pw[0]=0;			/* No password */
-diff -up mysql-5.5.28/include/mysql_com.h.p8 mysql-5.5.28/include/mysql_com.h
---- mysql-5.5.28/include/mysql_com.h.p8	2012-08-29 10:50:46.000000000 +0200
-+++ mysql-5.5.28/include/mysql_com.h	2012-12-06 14:16:14.599520860 +0100
-@@ -452,6 +452,7 @@ my_bool	my_net_init(NET *net, Vio* vio);
- void	my_net_local_init(NET *net);
- void	net_end(NET *net);
-   void	net_clear(NET *net, my_bool clear_buffer);
-+#define net_realloc mysql_net_realloc		/* namespace sanity */
- my_bool net_realloc(NET *net, size_t length);
- my_bool	net_flush(NET *net);
- my_bool	my_net_write(NET *net,const unsigned char *packet, size_t len);
-@@ -533,14 +534,12 @@ double my_rnd(struct rand_struct *);
- void create_random_string(char *to, unsigned int length, struct rand_struct *rand_st);
- 
- void hash_password(unsigned long *to, const char *password, unsigned int password_len);
--void make_scrambled_password_323(char *to, const char *password);
- void scramble_323(char *to, const char *message, const char *password);
- my_bool check_scramble_323(const unsigned char *reply, const char *message,
-                            unsigned long *salt);
- void get_salt_from_password_323(unsigned long *res, const char *password);
- void make_password_from_salt_323(char *to, const unsigned long *salt);
- 
--void make_scrambled_password(char *to, const char *password);
- void scramble(char *to, const char *message, const char *password);
- my_bool check_scramble(const unsigned char *reply, const char *message,
-                        const unsigned char *hash_stage2);
-diff -up mysql-5.5.28/include/mysql.h.pp.p8 mysql-5.5.28/include/mysql.h.pp
---- mysql-5.5.28/include/mysql.h.pp.p8	2012-08-29 10:50:46.000000000 +0200
-+++ mysql-5.5.28/include/mysql.h.pp	2012-12-06 14:16:14.598520859 +0100
-@@ -86,7 +86,7 @@ my_bool my_net_init(NET *net, Vio* vio);
- void my_net_local_init(NET *net);
- void net_end(NET *net);
-   void net_clear(NET *net, my_bool clear_buffer);
--my_bool net_realloc(NET *net, size_t length);
-+my_bool mysql_net_realloc(NET *net, size_t length);
- my_bool net_flush(NET *net);
- my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
- my_bool net_write_command(NET *net,unsigned char command,
-@@ -128,13 +128,11 @@ void randominit(struct rand_struct *, un
- double my_rnd(struct rand_struct *);
- void create_random_string(char *to, unsigned int length, struct rand_struct *rand_st);
- void hash_password(unsigned long *to, const char *password, unsigned int password_len);
--void make_scrambled_password_323(char *to, const char *password);
- void scramble_323(char *to, const char *message, const char *password);
- my_bool check_scramble_323(const unsigned char *reply, const char *message,
-                            unsigned long *salt);
- void get_salt_from_password_323(unsigned long *res, const char *password);
- void make_password_from_salt_323(char *to, const unsigned long *salt);
--void make_scrambled_password(char *to, const char *password);
- void scramble(char *to, const char *message, const char *password);
- my_bool check_scramble(const unsigned char *reply, const char *message,
-                        const unsigned char *hash_stage2);
-diff -up mysql-5.5.28/include/my_sys.h.p8 mysql-5.5.28/include/my_sys.h
---- mysql-5.5.28/include/my_sys.h.p8	2012-12-06 14:09:15.218170154 +0100
-+++ mysql-5.5.28/include/my_sys.h	2012-12-06 14:16:14.598520859 +0100
-@@ -218,6 +218,7 @@ extern uint    my_large_page_size;
- 
- /* charsets */
- #define MY_ALL_CHARSETS_SIZE 2048
-+#define default_charset_info mysql_default_charset_info	/* namespace sanity */
- extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
- extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
- extern CHARSET_INFO compiled_charsets[];
-@@ -895,6 +896,9 @@ extern uint get_charset_number(const cha
- extern uint get_collation_number(const char *name);
- extern const char *get_charset_name(uint cs_number);
- 
-+#define get_charset mysql_get_charset		/* namespace sanity */
-+#define get_charset_by_csname mysql_get_charset_by_csname
-+
- extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
- extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
- extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
-diff -up mysql-5.5.28/sql/password.c.p8 mysql-5.5.28/sql/password.c
---- mysql-5.5.28/sql/password.c.p8	2012-08-29 10:50:46.000000000 +0200
-+++ mysql-5.5.28/sql/password.c	2012-12-06 14:16:14.599520860 +0100
-@@ -155,23 +155,6 @@ void my_make_scrambled_password_323(char
- 
- 
- /*
--  Wrapper around my_make_scrambled_password_323() to maintain client lib ABI
--  compatibility.
--  In server code usage of my_make_scrambled_password_323() is preferred to
--  avoid strlen().
--  SYNOPSIS
--    make_scrambled_password_323()
--    to        OUT store scrambled password here
--    password  IN  NULL-terminated string with user-supplied password
--*/
--
--void make_scrambled_password_323(char *to, const char *password)
--{
--  my_make_scrambled_password_323(to, password, strlen(password));
--}
--
--
--/*
-     Scramble string with password.
-     Used in pre 4.1 authentication phase.
-   SYNOPSIS
-@@ -434,23 +417,6 @@ void my_make_scrambled_password(char *to
-   
- 
- /*
--  Wrapper around my_make_scrambled_password() to maintain client lib ABI
--  compatibility.
--  In server code usage of my_make_scrambled_password() is preferred to
--  avoid strlen().
--  SYNOPSIS
--    make_scrambled_password()
--    buf       OUT buffer of size 2*SHA1_HASH_SIZE + 2 to store hex string
--    password  IN  NULL-terminated password string
--*/
--
--void make_scrambled_password(char *to, const char *password)
--{
--  my_make_scrambled_password(to, password, strlen(password));
--}
--
--
--/*
-     Produce an obscure octet sequence from password and random
-     string, recieved from the server. This sequence corresponds to the
-     password, but password can not be easily restored from it. The sequence