Merge lp:~stewart/percona-server/pkg-5.1 into lp:percona-server/5.1

[Stewart Smith]

I'm proposing this branch now for the explicit purpose of feedback/review, it is NOT yet ready to merge. The deb and RPM packaging is not yet fixed for the new tree layout, so it's not yet a good idea to merge (it would break releasing).

This tree:
1) moves makes Percona-Server/ the top level directory in the repo, preserving file-id from original MySQL repo.
2) fix up 'make dist' target to produce a full source tarball
3) fix build-binary.sh to build a binary tarball with adjusted directory structure
4) merges the libperconaserverclient patch
5) moves our version numbers into the autoconf file, which is a different thing than what we've been doing in the past, but it enables things like 'make dist' to do the correct thing.

[Laurynas Biveinis (laurynas-biveinis)]

Very nice. A few comments:

- Link bug 1014477, also, per that bug, move UDF to storage/
- Feel free to fix up bug 1174779 bits, the ones that are touched by this patch (maatkit-udf in Makefile etc). Can be done in separate commits.
- Why the build-binary.sh interpreter change?

Since this is not a real MP yet, leaving it as "Needs Review" for any further comments.

[Stewart Smith (stewart)]

> - Why the build-binary.sh interpreter change?

Because that's what it actually needed. It exploded horribly with /bin/sh on my Ubuntu systems and worked fine with bash. The Ubuntu change of /bin/sh being sh rather than bash is truly the most frustrating and time wasting technically correct thing ever.

[Stewart Smith (stewart)]

> Very nice. A few comments:
>
> - Link bug 1014477, also, per that bug, move UDF to storage/

The move to plugin/ likely makes sense. We could actually integrate these with the MySQL plugin build system and have them automagically integrated into the build+packaging which makes a lot of sense.

I'll look at it at a later point in all of this, fewer moving parts the better currently.

> - Feel free to fix up bug 1174779 bits, the ones that are touched by this
> patch (maatkit-udf in Makefile etc). Can be done in separate commits.

Makes sense.

[Stewart Smith (stewart)]

I'm going to reject the 5.1 branch as it turns out with existing Debian packaging it's just hard to get 5.1 to work right alongside MySQL 5.5 in the repo and it's unlikely worth the effort to make it work.

=== renamed directory 'Percona-Server' => ''
=== removed file '.bzrignore'
--- .bzrignore	2012-07-12 08:48:23 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-build
-.pc
-Makefile.in

=== renamed file 'COPYING.show_temp_51' => 'COPYING.show_temp_51'
=== renamed file 'Makefile' => 'Makefile-ps'
--- Makefile	2013-10-22 13:31:04 +0000
+++ Makefile-ps	2013-12-13 06:18:17 +0000
@@ -6,7 +6,7 @@
 KEWPIE ?=kewpie
 BASEDIR = $(CURDIR)
 
-all:  main install-lic handlersocket maatkit-udf autorun
+all:  maatkit-udf autorun
 	@echo ""
 	@echo "Percona Server source code is ready"
 	@echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
@@ -19,30 +19,10 @@
 	@echo ""
 
 autorun:
-	cd $(PERCONA_SERVER) && ./BUILD/autorun.sh
-
-handlersocket:
-	cp -R HandlerSocket-Plugin-for-MySQL $(PERCONA_SERVER)/storage
-	patch -p1 -d $(PERCONA_SERVER)/storage < handlersocket.patch
+	./BUILD/autorun.sh
 
 maatkit-udf:
-	cp -R UDF "$(PERCONA_SERVER)"
-	cd "$(PERCONA_SERVER)"/UDF && autoreconf --install
-
-install-lic: 
-	@echo "Installing license files"
-	install -m 644 COPYING.* $(PERCONA_SERVER)
-
-prepare: 
-	@echo "Prepare Percona Server sources"
-	rm -rf $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
-	ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER)
-	ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER_SHORT_1)
-
-main: prepare
-
-clean:
-	rm -rf $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
+	cd UDF && autoreconf --install
 
 test-crashme:
 	cd $(KEWPIE) && ./kewpie.py --suite=crashme --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)

=== modified file 'Makefile.am'
--- Percona-Server/Makefile.am	2013-03-19 12:29:12 +0000
+++ Makefile.am	2013-12-13 06:18:17 +0000
@@ -17,9 +17,321 @@
 
 AUTOMAKE_OPTIONS =	foreign
 
+HANDLERSOCKET_EXTRA_DIST = \
+	storage/HandlerSocket-Plugin-for-MySQL/AUTHORS \
+	storage/HandlerSocket-Plugin-for-MySQL/autogen.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/ChangeLog \
+	storage/HandlerSocket-Plugin-for-MySQL/COPYING \
+	storage/HandlerSocket-Plugin-for-MySQL/Makefile.am \
+	storage/HandlerSocket-Plugin-for-MySQL/README \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hsclient.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hslongrun.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hspool_test.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hstest.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hstest.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hstest_hs.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hstest_hs_more50.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hstest_md.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hstest_my.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/client/hstest_my_more50.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/client/Makefile.am \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-en/about-handlersocket.en.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-en/configuration-options.en.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-en/installation.en.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-en/perl-client.en.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-en/protocol.en.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-ja/about-handlersocket.ja.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-ja/installation.ja.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-ja/perl-client.ja.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/docs-ja/protocol.ja.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/COPYRIGHT.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/database.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/database.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/handlersocket.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/handlersocket.spec.template \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/hstcpsvr.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/hstcpsvr.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/hstcpsvr_worker.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/hstcpsvr_worker.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/Makefile.am \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/Makefile.plain.template \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/mysql_incl.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/allocator.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/auto_addrinfo.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/auto_file.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/auto_ptrcontainer.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/config.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/config.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/COPYRIGHT.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/escape.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/escape.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/fatal.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/fatal.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/hstcpcli.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/hstcpcli.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/libhsclient.spec.template \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/Makefile.am \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/Makefile.plain \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/mutex.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/socket.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/socket.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/string_buffer.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/string_ref.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/string_util.cpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/string_util.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/thread.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/util.hpp \
+	storage/HandlerSocket-Plugin-for-MySQL/misc/microbench-hs.log \
+	storage/HandlerSocket-Plugin-for-MySQL/misc/microbench-my.log \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/Changes \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/COPYRIGHT.txt \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/HandlerSocket.xs \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/Makefile.PL \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/Makefile.PL.installed \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/MANIFEST \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/perl-Net-HandlerSocket.spec.template \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/ppport.h \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/README \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/lib/Net/HandlerSocket.pm \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/lib/Net/HandlerSocket/Pool.pm \
+	storage/HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/t/Net-HandlerSocket.t \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/Makefile \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/common/binary_my.cnf \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/common/compat.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/common/hstest.pm \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/Makefile \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/run.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test01.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test01.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test02.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test02.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test03.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test03.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test04.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test04.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test05.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test05.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test06.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test06.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test07.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test07.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test08.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test08.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test09.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test09.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test10.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test10.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test11.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test11.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test12.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test12.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test13.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test13.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test14.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test14.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test15.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test15.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test16.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test16.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test17.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test17.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test18.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test18.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test19.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test19.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test20.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test20.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test21.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test21.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test22.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test22.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test23.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test23.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test24.expected \
+	storage/HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib/test24.pl \
+	storage/HandlerSocket-Plugin-for-MySQL/configure.ac \
+	storage/HandlerSocket-Plugin-for-MySQL/configure \
+	storage/HandlerSocket-Plugin-for-MySQL/install-sh \
+	storage/HandlerSocket-Plugin-for-MySQL/config.sub \
+	storage/HandlerSocket-Plugin-for-MySQL/config.guess \
+	storage/HandlerSocket-Plugin-for-MySQL/Makefile.in \
+	storage/HandlerSocket-Plugin-for-MySQL/client/Makefile.in \
+	storage/HandlerSocket-Plugin-for-MySQL/handlersocket/Makefile.in \
+	storage/HandlerSocket-Plugin-for-MySQL/libhsclient/Makefile.in \
+	storage/HandlerSocket-Plugin-for-MySQL/config.h.in \
+	storage/HandlerSocket-Plugin-for-MySQL/m4/libtool.m4 \
+	storage/HandlerSocket-Plugin-for-MySQL/m4/ltoptions.m4 \
+	storage/HandlerSocket-Plugin-for-MySQL/m4/ltsugar.m4 \
+	storage/HandlerSocket-Plugin-for-MySQL/m4/ltversion.m4 \
+	storage/HandlerSocket-Plugin-for-MySQL/m4/lt~obsolete.m4 \
+	storage/HandlerSocket-Plugin-for-MySQL/missing \
+	storage/HandlerSocket-Plugin-for-MySQL/aclocal.m4 \
+	storage/HandlerSocket-Plugin-for-MySQL/ltmain.sh \
+	storage/HandlerSocket-Plugin-for-MySQL/depcomp
+
+
+
+storage/HandlerSocket-Plugin-for-MySQL/configure: storage/HandlerSocket-Plugin-for-MySQL/autogen.sh
+	(cd storage/HandlerSocket-Plugin-for-MySQL/; ./autogen.sh)
+
+UDF_EXTRA_DIST = \
+	UDF/Makefile.am \
+	UDF/src/fnv1a_udf.cc \
+	UDF/src/fnv_udf.cc \
+	UDF/src/Makefile.am \
+	UDF/src/murmur_udf.cc \
+	UDF/configure.ac \
+	UDF/configure \
+	UDF/config.h.in \
+	UDF/Makefile.in \
+	UDF/aclocal.m4 \
+	UDF/src/Makefile.in \
+	UDF/m4/libtool.m4 \
+	UDF/m4/ltoptions.m4 \
+	UDF/m4/ltsugar.m4 \
+	UDF/m4/ltversion.m4 \
+	UDF/m4/lt~obsolete.m4
+
+
+
+UDF/configure: UDF/configure.ac
+	(cd UDF/; autoreconf --install)
+
+BUILD_PS_EXTRA_DIST = \
+	build-ps/build-dpkg.sh \
+	build-ps/build-rpm.sh \
+	build-ps/build-shared-compat-rpm.sh \
+	build-ps/README-solaris \
+	build-ps/README-windows \
+	build-ps/debian/changelog \
+	build-ps/debian/compat \
+	build-ps/debian/copyright \
+	build-ps/debian/libperconaserverclient16-dev.docs \
+	build-ps/debian/libperconaserverclient16.docs \
+	build-ps/debian/libperconaserverclient16.dirs \
+	build-ps/debian/libperconaserverclient16.files \
+	build-ps/debian/libperconaserverclient16.postinst \
+	build-ps/debian/libperconaserverclient16-dev.dirs \
+	build-ps/debian/libperconaserverclient16-dev.examples \
+	build-ps/debian/libperconaserverclient16-dev.files \
+	build-ps/debian/libperconaserverclient16-dev.links \
+	build-ps/debian/libperconaserverclient16.lintian-overrides \
+	build-ps/debian/libperconaserverclient16-dev.README.Maintainer \
+	build-ps/debian/percona-server-server-5.1.docs \
+	build-ps/debian/percona-server-client-5.1.README.Debian \
+	build-ps/debian/percona-server-client-5.1.dirs \
+	build-ps/debian/percona-server-client-5.1.docs \
+	build-ps/debian/percona-server-client-5.1.files \
+	build-ps/debian/percona-server-client-5.1.links \
+	build-ps/debian/percona-server-client-5.1.lintian-overrides \
+	build-ps/debian/percona-server-common-5.1.dirs \
+	build-ps/debian/percona-server-common-5.1.files \
+	build-ps/debian/percona-server-common-5.1.lintian-overrides \
+	build-ps/debian/percona-server-common-5.1.postrm \
+	build-ps/debian/percona-server-server-5.1.NEWS \
+	build-ps/debian/percona-server-server-5.1.README.Debian \
+	build-ps/debian/percona-server-server-5.1.config \
+	build-ps/debian/percona-server-server-5.1.dirs \
+	build-ps/debian/percona-server-server-5.1.files \
+	build-ps/debian/percona-server-server-5.1.links \
+	build-ps/debian/percona-server-server-5.1.lintian-overrides \
+	build-ps/debian/percona-server-server-5.1.logcheck.ignore.paranoid \
+	build-ps/debian/percona-server-server-5.1.logcheck.ignore.server \
+	build-ps/debian/percona-server-server-5.1.logcheck.ignore.workstation \
+	build-ps/debian/percona-server-server-5.1.mysql.init \
+	build-ps/debian/percona-server-server-5.1.percona-xtradb-server.logrotate \
+	build-ps/debian/percona-server-server-5.1.postinst \
+	build-ps/debian/percona-server-server-5.1.postrm \
+	build-ps/debian/percona-server-server-5.1.preinst \
+	build-ps/debian/percona-server-server-5.1.prerm \
+	build-ps/debian/percona-server-server-5.1.templates \
+	build-ps/debian/README.Maintainer \
+	build-ps/debian/source.lintian-overrides \
+	build-ps/debian/watch \
+	build-ps/debian/additions/debian-start \
+	build-ps/debian/additions/debian-start.inc.sh \
+	build-ps/debian/additions/Docs__Images__Makefile.in \
+	build-ps/debian/additions/Docs__Makefile.in \
+	build-ps/debian/additions/echo_stderr \
+	build-ps/debian/additions/msql2mysql.1 \
+	build-ps/debian/additions/my.cnf \
+	build-ps/debian/additions/my_print_defaults.1 \
+	build-ps/debian/additions/myisam_ftdump.1 \
+	build-ps/debian/additions/myisamchk.1 \
+	build-ps/debian/additions/myisamlog.1 \
+	build-ps/debian/additions/myisampack.1 \
+	build-ps/debian/additions/mysql_config.1 \
+	build-ps/debian/additions/mysql_convert_table_format.1 \
+	build-ps/debian/additions/mysql_find_rows.1 \
+	build-ps/debian/additions/mysql_fix_extensions.1 \
+	build-ps/debian/additions/mysql_install_db.1 \
+	build-ps/debian/additions/mysql_secure_installation.1 \
+	build-ps/debian/additions/mysql_setpermission.1 \
+	build-ps/debian/additions/mysql_tableinfo.1 \
+	build-ps/debian/additions/mysql_waitpid.1 \
+	build-ps/debian/additions/mysqlbinlog.1 \
+	build-ps/debian/additions/mysqlbug.1 \
+	build-ps/debian/additions/mysqlcheck.1 \
+	build-ps/debian/additions/mysqld_safe_syslog.cnf \
+	build-ps/debian/additions/mysqldumpslow.1 \
+	build-ps/debian/additions/mysqlimport.1 \
+	build-ps/debian/additions/mysqlmanager.1 \
+	build-ps/debian/additions/mysqlreport \
+	build-ps/debian/additions/mysqlreport.1 \
+	build-ps/debian/additions/mysql-server.lintian-overrides \
+	build-ps/debian/additions/mysqltest.1 \
+	build-ps/debian/additions/pack_isam.1 \
+	build-ps/debian/additions/resolve_stack_dump.1 \
+	build-ps/debian/additions/resolveip.1 \
+	build-ps/debian/patches/00list \
+	build-ps/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch \
+	build-ps/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch \
+	build-ps/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch \
+	build-ps/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch \
+	build-ps/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch \
+	build-ps/debian/patches/44_scripts__mysql_config__libs.dpatch \
+	build-ps/debian/patches/50_mysql-test__db_test.dpatch \
+	build-ps/debian/patches/60_usr_share_mysql_mysql_test.dpatch \
+	build-ps/debian/po/ar.po \
+	build-ps/debian/po/ca.po \
+	build-ps/debian/po/cs.po \
+	build-ps/debian/po/da.po \
+	build-ps/debian/po/de.po \
+	build-ps/debian/po/es.po \
+	build-ps/debian/po/eu.po \
+	build-ps/debian/po/fr.po \
+	build-ps/debian/po/gl.po \
+	build-ps/debian/po/it.po \
+	build-ps/debian/po/ja.po \
+	build-ps/debian/po/nb.po \
+	build-ps/debian/po/nl.po \
+	build-ps/debian/po/POTFILES.in \
+	build-ps/debian/po/pt.po \
+	build-ps/debian/po/pt_BR.po \
+	build-ps/debian/po/ro.po \
+	build-ps/debian/po/ru.po \
+	build-ps/debian/po/sv.po \
+	build-ps/debian/po/templates.pot \
+	build-ps/debian/po/tr.po \
+	build-ps/debian/control \
+	build-ps/debian/rules \
+	build-ps/debian/source/format \
+	build-ps/percona-server.spec \
+	build-ps/percona-shared-compat.spec \
+	build-ps/build-binary.sh
+
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
-			README COPYING CMakeLists.txt
+			README.MySQL COPYING CMakeLists.txt \
+			COPYING.innodb_fast_shutdown \
+			COPYING.show_temp_51 \
+			README \
+			README.HandlerSocket \
+			Makefile-ps \
+			$(HANDLERSOCKET_EXTRA_DIST) \
+			$(UDF_EXTRA_DIST) \
+			$(BUILD_PS_EXTRA_DIST)
+
 
 SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \
 			@readline_topdir@ sql-common scripts \
@@ -84,29 +396,30 @@
 
 test-ps:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed
+	    @PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed --parallel=auto
 
 test-nr:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=row
+	    @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=row --parallel=auto
 
 test-pr:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row
+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row --parallel=auto
 
 test-ns:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed --parallel=auto
 
 test-binlog-statement:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
+	    @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement --parallel=auto
 
 # This code is duplicated in "test-bt", see the Changeset comment of 2007-Dec-07
 test-embedded:
 	if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
 	      @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
+		  --parallel=auto \
 	          --embedded-server --skip-rpl --skip-ndbcluster ; \
 	else \
 	  echo "no program found for 'embedded' tests - skipped testing" ; \
@@ -115,13 +428,14 @@
 test-reprepare:
 	cd mysql-test ; \
 	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol \
+		--parallel=auto \
 		--mysqld=--debug=+d,reprepare_each_statement
 
 test:	test-unit test-ns test-pr
 
 smoke:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl --do-test=s
+	    @PERL@ ./mysql-test-run.pl --do-test=s --parallel=auto
 
 test-full:	test test-nr test-ps
 
@@ -138,42 +452,47 @@
 test-bt:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl --comment=normal --force --timer \
+		--parallel=auto \
 	        --skip-ndbcluster --report-features
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl  --comment=ps    --force --timer \
+		--parallel=auto \
 	        --skip-ndbcluster --ps-protocol
 	-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
 	  cd mysql-test ; \
 	    MTR_BUILD_THREAD=auto \
 	      @PERL@ ./mysql-test-run.pl --comment=ndb+ps --force --timer \
+		  --parallel=auto \
 	          --ps-protocol --mysqld=--binlog-format=row --suite=ndb ; \
 	    MTR_BUILD_THREAD=auto \
 	      @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
+		  --parallel=auto \
 	          --with-ndbcluster-only ; \
 	else \
 	  echo "no program found for 'ndbcluster' tests - skipped testing" ; \
 	fi
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp
+	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1 --parallel=auto
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2  --parallel=auto
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts --parallel=auto
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress --parallel=auto
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp --parallel=auto
 	-if [ -d mysql-test/suite/nist ] ; then \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
-	      @PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
+	      @PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist  --parallel=auto; \
 	fi
 	-if [ -d mysql-test/suite/nist ] ; then \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
-	      @PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \
+	      @PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol  --parallel=auto; \
 	fi
 	-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
 	      @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
+		  --parallel=auto \
 	          --embedded-server --skip-rpl --skip-ndbcluster ; \
 	else \
 	  echo "no program found for 'embedded' tests - skipped testing" ; \
@@ -182,21 +501,25 @@
 test-bt-fast:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl  --comment=ps    --force --timer \
+		--parallel=auto \
 	        --skip-ndbcluster --ps-protocol --report-features
 	-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
 	  cd mysql-test ; \
 	    MTR_BUILD_THREAD=auto \
 	      @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
+		  --parallel=auto \
 	          --with-ndbcluster-only ; \
 	else \
 	  echo "no program found for 'ndbcluster' tests - skipped testing" ; \
 	fi
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
+	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress \
+		  --parallel=auto
 
 test-bt-debug:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl --comment=debug  --force --timer \
+		--parallel=auto \
 	        --skip-ndbcluster --skip-rpl --report-features
 
 test-bt-debug-fast:
@@ -212,32 +535,32 @@
 
 test-ext-funcs:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 ; \
-	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_2
+	    @PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 --parallel=auto; \
+	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_2 --parallel=auto
 
 test-ext-rpl:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl --force --suite=rpl
+	    @PERL@ ./mysql-test-run.pl --force --suite=rpl --parallel=auto
 
 test-ext-partitions:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl --force --suite=parts
+	    @PERL@ ./mysql-test-run.pl --force --suite=parts --parallel=auto
 
 test-ext-jp:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl --force --suite=jp
+	    @PERL@ ./mysql-test-run.pl --force --suite=jp --parallel=auto
 
 test-ext-stress:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl --force --big-test --suite=stress
+	    @PERL@ ./mysql-test-run.pl --force --big-test --suite=stress --parallel=auto
 
 test-ext:	test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp test-ext-stress
 
 test-fast:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \
-	    @PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam ; \
-	    @PERL@ ./mysql-test-run.pl $(subset) --force --suite=stress --do-test=ddl_myisam 
+	    @PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl  --parallel=auto; \
+	    @PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam  --parallel=auto; \
+	    @PERL@ ./mysql-test-run.pl $(subset) --force --suite=stress --do-test=ddl_myisam  --parallel=auto
 
 test-fast-view:
 	$(MAKE) subset=--view-protocol test-fast

=== renamed file 'README.txt' => 'README'
=== renamed file 'README.HandlerSocket' => 'README.HandlerSocket'
=== renamed file 'Percona-Server/README' => 'README.MySQL'
=== renamed directory 'UDF' => 'UDF'
=== modified file 'UDF/Makefile.am'
--- UDF/Makefile.am	2010-12-17 15:26:10 +0000
+++ UDF/Makefile.am	2013-12-13 06:18:17 +0000
@@ -1,1 +1,3 @@
+ACLOCAL_AMFLAGS = -Im4
+
 SUBDIRS = src

=== modified file 'UDF/configure.ac'
--- UDF/configure.ac	2013-12-13 06:18:14 +0000
+++ UDF/configure.ac	2013-12-13 06:18:17 +0000
@@ -1,12 +1,15 @@
 AC_INIT([maatkit-udf], [0.1], [http://code.google.com/p/maatkit/issues/list])
+<<<<<<< TREE
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+=======
+AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])
+AC_CONFIG_MACRO_DIR([m4])
+>>>>>>> MERGE-SOURCE
 LT INIT
 AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_RANLIB
-AM_PROG_AR
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_OUTPUT

=== added directory 'UDF/m4'
=== renamed directory 'build' => 'build-ps'
=== modified file 'build-ps/build-binary.sh'
--- build/build-binary.sh	2013-08-27 15:04:34 +0000
+++ build-ps/build-binary.sh	2013-12-13 06:18:17 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Execute this tool to setup the environment and build binary releases
 # for Percona-Server starting from a fresh tree.
@@ -87,7 +87,7 @@
 fi
 
 SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
-test -e "$SOURCEDIR/Makefile" || exit 2
+test -e "$SOURCEDIR/Makefile-ps" || exit 2
 
 # The number of processors is a good default for -j
 if test -e "/proc/cpuinfo"
@@ -97,11 +97,11 @@
     PROCESSORS=4
 fi
 
-# Extract version from the Makefile
-MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
+# Extract version from the Makefile-ps
+MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile-ps" \
     | cut -d = -f 2)"
 PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
-    "$SOURCEDIR/Makefile" | cut -d = -f 2)"
+    "$SOURCEDIR/Makefile-ps" | cut -d = -f 2)"
 PERCONA_INNODB_VERSION="$(echo "$PERCONA_SERVER_VERSION" |
     sed s/rel//)"
 PRODUCT="Percona-Server-$MYSQL_VERSION"
@@ -129,9 +129,8 @@
     cd "$SOURCEDIR"
  
     # Execute clean and download mysql, apply patches
-    make clean all
+    make -f Makefile-ps all
 
-    cd "$PRODUCT"
     ./configure \
         --prefix="/usr/local/$PRODUCT_FULL" \
         --localstatedir="/usr/local/$PRODUCT_FULL/data" \
@@ -145,7 +144,11 @@
         --with-unix-socket-path=/var/lib/mysql/mysql.sock \
         --with-pic \
         --with-extra-charsets=complex \
+<<<<<<< TREE
         --with-ssl="$WITH_SSL" \
+=======
+        --with-ssl \
+>>>>>>> MERGE-SOURCE
         --enable-thread-safe-client \
         --enable-profiling \
         --with-readline 
@@ -157,8 +160,8 @@
     (
         cd "storage/HandlerSocket-Plugin-for-MySQL"
         ./autogen.sh
-        CXX=${HS_CXX:-g++} ./configure --with-mysql-source="$SOURCEDIR/$PRODUCT" \
-            --with-mysql-bindir="$SOURCEDIR/$PRODUCT/scripts" \
+        CXX=${HS_CXX:-g++} ./configure --with-mysql-source="$SOURCEDIR" \
+            --with-mysql-bindir="$SOURCEDIR/scripts" \
             --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
             --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
             --prefix="/usr/local/$PRODUCT_FULL"
@@ -170,7 +173,7 @@
     # Build UDF
     (
         cd "UDF"
-        CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \
+        CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \
             --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
         make $MAKE_JFLAG
         make DESTDIR="$INSTALLDIR" install

=== modified file 'build-ps/build-rpm.sh'
--- build/build-rpm.sh	2013-06-05 18:12:21 +0000
+++ build-ps/build-rpm.sh	2013-12-13 06:18:17 +0000
@@ -111,8 +111,8 @@
 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
 
 # Build information
-REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
-    cut -d ' ' -f 2)"
+DISTRO_NAME="$(lsb_release -is)"
+REDHAT_RELEASE="$(lsb_release -rs)"
 PATCHSET="$(grep ^PATCHSET= "$SOURCEDIR/Makefile" | cut -d = -f 2)"
 REVISION="$(cd "$SOURCEDIR"; bzr revno)"
 

=== modified file 'build-ps/debian/control'
--- build/debian/control	2013-12-13 06:18:14 +0000
+++ build-ps/debian/control	2013-12-13 06:18:17 +0000
@@ -4,35 +4,35 @@
 Maintainer: Percona Server Development Team <[e-mail]>
 Uploaders: Ignacio Nin <[e-mail]>
 Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.0.50), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), po-debconf, chrpath, automake (>= 1.9), dpatch, gawk, bison, lsb-release, fakeroot, libssl-dev
-Standards-Version: 7.0.0
-Homepage: http://www.percona.com/software/
+Standards-Version: 3.9.4
+Homepage: http://www.percona.com/software/percona-server
 Vcs-Bzr: lp:percona-server/5.1
 
 Package: libperconaserverclient16
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libpercona-server-client16
 Description: Percona Server database client library
- Percona Server is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of Percona Server are speed, robustness and
- ease of use.
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
  .
  This package includes the client library.
 
 Package: libperconaserverclient16-dev
 Architecture: any
 Section: libdevel
-Depends: libperconaserverclient16 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}
+Depends: ${misc:Depends}, libperconaserverclient16 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
 Replaces: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libpercona-xtradb-client-dev
 Provides: libmysqlclient-dev, libmysqlclient15-dev, libmysqlclient16-dev
 Description: Percona Server database development files
- Percona Server is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of Percona Server are speed, robustness and
- ease of use.
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
  .
  This package includes development libraries and header files for the
  libmysqlclient16 version of the library.
@@ -41,29 +41,28 @@
 Section: database
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
 Provides: mysql-common
 Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
- Percona Server is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of Percona Server are speed, robustness and
- ease of use.
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
  .
  This package includes files needed by all versions of the client library
  (e.g. /etc/mysql/my.cnf).
 
 Package: percona-server-client-5.1
 Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, percona-server-common (>= ${source:Version}), libmysqlclient16 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: debianutils (>=1.6), libdbi-perl, percona-server-common (>= ${source:Version}), libperconaserverclient16 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: mysql-client, mysql-client-core, mysql-client-5.1, mysql-client-core-5.1
-Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, mysql-client-5.5, mysql-client-core-5.5, percona-xtradb-client-5.0
-Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1 (<< ${source:Version}), percona-xtradb-client-5.0
+Conflicts: mysql-client, mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, mysql-client-5.5, mysql-client-core-5.5, percona-xtradb-client-5.0
+Replaces: mysql-client, mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0
 Description: Percona Server database client binaries
- Percona Server is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of Percona Server are speed, robustness and
- ease of use.
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
  .
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
@@ -77,22 +76,23 @@
 Provides: mysql-server, mysql-server-core, mysql-server-5.1, mysql-server-core-5.1
 Conflicts: mysql-server (<< ${source:Version}), mysql-server-5.1, mysql-server-core-5.1, mysql-server-5.5, mysql-server-core-5.5, mysql-server-4.1, percona-xtradb-server-5.0
 Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-5.1, mysql-server-core-5.1, percona-xtradb-server-5.0
-Description: Percona Server database server binaries                                     
- Percona Server is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of Percona Server are speed, robustness and
- ease of use.
+Description: Percona Server database server binaries
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
  .
  This package includes the server binaries.
 
 Package: percona-server-5.1-dbg
 Architecture: any
 Section: debug
+Priority: extra
 Depends: percona-server-server-5.1 (= ${binary:Version}), ${misc:Depends}
 Description: Debugging package for Percona Server
- Percona Server is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of Percona Server are speed, robustness and
- ease of use.
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
  .
  This package contains the debugging symbols for the Percona Server binaries.

=== modified file 'build-ps/debian/copyright'
--- build/debian/copyright	2010-05-31 13:57:21 +0000
+++ build-ps/debian/copyright	2013-12-13 06:18:17 +0000
@@ -1,169 +1,787 @@
-
-== MySQL ==
-
-The Debian package of MySQL was first debianzed on 1997-04-12 by Christian
-Schwarz <[e-mail]> and ist maintained since 1999-04-20 by 
-Christian Hammers <[e-mail]>.
-
-It can be downloaded from http://www.mysql.com/
-
-Copyright:
-
-According to the file "COPYING" all parts of this package are licenced
-under the terms of the GNU GPL Version 2 of which a copy is available
-in /usr/share/common-licenses.
-
-To allow free software with other licences than the GPL to link against the 
-shared library, special terms for "derived works" are defined in the file
-"EXCEPTIONS-CLIENT" which is quoted below.
-
-More information can be found on http://www.mysql.com/company/legal/licensing/
-
-The manual had to be removed as it is not free in the sense of the
-Debian Free Software Guidelines (DFSG). 
-
-> Appendix I MySQL FLOSS License Exception
-> ****************************************
-> 
->                      Version 0.3, 10 February 2005
-> 
-> The MySQL AB Exception for Free/Libre and Open Source Software-only
-> Applications Using MySQL Client Libraries (the "FLOSS Exception").
-> 
-> Exception Intent
-> ================
-> 
-> We want specified Free/Libre and Open Source Software ("FLOSS")
-> applications to be able to use specified GPL-licensed MySQL client
-> libraries (the "Program") despite the fact that not all FLOSS licenses
-> are compatible with version 2 of the GNU General Public License (the
-> "GPL").
-> 
-> Legal Terms and Conditions
-> ==========================
-> 
-> As a special exception to the terms and conditions of version 2.0 of the
-> GPL:
-> 
->   1. You are free to distribute a Derivative Work that is formed
->      entirely from the Program and one or more works (each, a "FLOSS
->      Work") licensed under one or more of the licenses listed below in
->      section 1, as long as:
-> 
->        a. You obey the GPL in all respects for the Program and the
->           Derivative Work, except for identifiable sections of the
->           Derivative Work which are not derived from the Program, and
->           which can reasonably be considered independent and separate
->           works in themselves,
-> 
->        b. all identifiable sections of the Derivative Work which are not
->           derived from the Program, and which can reasonably be
->           considered independent and separate works in themselves,
-> 
->          i
->                are distributed subject to one of the FLOSS licenses
->                listed below, and
-> 
->          ii
->                the object code or executable form of those sections are
->                accompanied by the complete corresponding
->                machine-readable source code for those sections on the
->                same medium and under the same FLOSS license as the
->                corresponding object code or executable forms of those
->                sections, and
-> 
->        c. any works which are aggregated with the Program or with a
->           Derivative Work on a volume of a storage or distribution
->           medium in accordance with the GPL, can reasonably be
->           considered independent and separate works in themselves which
->           are not derivatives of either the Program, a Derivative Work
->           or a FLOSS Work.
-> 
->      If the above conditions are not met, then the Program may only be
->      copied, modified, distributed or used under the terms and
->      conditions of the GPL or another valid licensing option from MySQL
->      AB.
-> 
->   2. FLOSS License List
-> 
->      *License name*                           *Version(s)/Copyright Date*
->      Academic Free License                    2.0
->      Apache Software License                  1.0/1.1/2.0
->      Apple Public Source License              2.0
->      Artistic license                         From Perl 5.8.0
->      BSD license                              "July 22 1999"
->      Common Public License                    1.0
->      GNU Library or "Lesser" General Public   2.0/2.1
->      License (LGPL)                           
->      Jabber Open Source License               1.0
->      MIT license                              -
->      Mozilla Public License (MPL)             1.0/1.1
->      Open Software License                    2.0
->      OpenSSL license (with original SSLeay    "2003" ("1998")
->      license)                                 
->      PHP License                              3.0
->      Python license (CNRI Python License)     -
->      Python Software Foundation License       2.1.1
->      Sleepycat License                        "1999"
->      W3C License                              "2001"
->      X11 License                              "2001"
->      Zlib/libpng License                      -
->      Zope Public License                      2.0
-> 
->      Due to the many variants of some of the above licenses, we require
->      that any version follow the 2003 version of the Free Software
->      Foundation's Free Software Definition
->      (`http://www.gnu.org/philosophy/free-sw.html') or version 1.9 of
->      the Open Source Definition by the Open Source Initiative
->      (`http://www.opensource.org/docs/definition.php').
-> 
->   3. Definitions
-> 
->        a. Terms used, but not defined, herein shall have the meaning
->           provided in the GPL.
-> 
->        b. Derivative Work means a derivative work under copyright law.
-> 
->   4. Applicability This FLOSS Exception applies to all Programs that
->      contain a notice placed by MySQL AB saying that the Program may be
->      distributed under the terms of this FLOSS Exception.  If you
->      create or distribute a work which is a Derivative Work of both the
->      Program and any other work licensed under the GPL, then this FLOSS
->      Exception is not available for that work; thus, you must remove
->      the FLOSS Exception notice from that work and comply with the GPL
->      in all respects, including by retaining all GPL notices.  You may
->      choose to redistribute a copy of the Program exclusively under the
->      terms of the GPL by removing the FLOSS Exception notice from that
->      copy of the Program, provided that the copy has never been
->      modified by you or any third party.
- 
-
-== innotop ==
-
-Author: Baron Schwartz <[e-mail]>
-URL:    http://innotop.sourceforge.net
-
-License:
-> This software is dual licensed, either GPL version 2 or Artistic License.
->
-> This package 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; either version 2 of the License, or
-> (at your option) any later version.
->
-> This package 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 package; if not, write to the Free Software
-> Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License and the
-Artistic License can be found in `/usr/share/common-licenses/'.
-
-The upstream author explained here: http://bugs.gentoo.org/show_bug.cgi?id=14760
-that these licenses also apply to the following files:
-- innotop.html
-- InnoDBParser.pm
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Upstream-Name: Percona Server 5.1
+Upstream-Contact: https://bugs.launchpad.net/percona-server/
+Source: http://www.percona.com/downloads/Percona-Server-5.1/
+Comments: Modified from original MySQL 5.5 debian/copyright file by
+ Stewart Smith and updated for Percona Server.
+ .
+ Originally produced by a modified version of licensecheck2dep5
+ from CDBS by Clint Byrum <[e-mail]>. Hand modified to reduce 
+ redundancy in the output and add appropriate license text.
+ .
+ Also, MySQL carries the "FOSS License Exception" specified in README
+ .
+ Quoting from README:
+ .
+ MySQL FOSS License Exception We want free and open source
+ software applications under certain licenses to be able to use
+ specified GPL-licensed MySQL client libraries despite the fact
+ that not all such FOSS licenses are compatible with version
+ 2 of the GNU General Public License.  Therefore there are
+ special exceptions to the terms and conditions of the GPLv2
+ as applied to these client libraries, which are identified
+ and described in more detail in the FOSS License Exception at
+ <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+ .
+ The text of the Above URL is quoted below, as of Aug 17, 2011.
+ .
+ > FOSS License Exception
+ > .
+ > Updated July 1, 2010
+ > .
+ > What is the FOSS License Exception?  Oracle's Free and Open Source
+ > Software ("FOSS") License Exception (formerly known as the FLOSS
+ > License Exception) allows developers of FOSS applications to include
+ > Oracle's MySQL Client Libraries (also referred to as "MySQL Drivers"
+ > or "MySQL Connectors") with their FOSS applications. MySQL Client
+ > Libraries are typically licensed pursuant to version 2 of the General
+ > Public License ("GPL"), but this exception permits distribution of
+ > certain MySQL Client Libraries with a developer's FOSS applications
+ > licensed under the terms of another FOSS license listed below,
+ > even though such other FOSS license may be incompatible with the GPL.
+ > .
+ > The following terms and conditions describe the circumstances under
+ > which Oracle's FOSS License Exception applies.
+ > .
+ > Oracle's FOSS License Exception Terms and Conditions Definitions.
+ > "Derivative Work" means a derivative work, as defined under applicable
+ > copyright law, formed entirely from the Program and one or more
+ > FOSS Applications.
+ > .
+ > "FOSS Application" means a free and open source software application
+ > distributed subject to a license listed in the section below titled
+ > "FOSS License List."
+ > .
+ > "FOSS Notice" means a notice placed by Oracle or MySQL in a copy
+ > of the MySQL Client Libraries stating that such copy of the MySQL
+ > Client Libraries may be distributed under Oracle's or MySQL's FOSS
+ > (or FLOSS) License Exception.
+ > .
+ > "Independent Work" means portions of the Derivative Work that are not
+ > derived from the Program and can reasonably be considered independent
+ > and separate works.
+ > .
+ > "Program" means a copy of Oracle's MySQL Client Libraries that
+ > contains a FOSS Notice.
+ > . 
+ > A FOSS application developer ("you" or "your") may distribute a
+ > Derivative Work provided that you and the Derivative Work meet all
+ > of the following conditions: You obey the GPL in all respects for
+ > the Program and all portions (including modifications) of the Program
+ > included in the Derivative Work (provided that this condition does not
+ > apply to Independent Works); The Derivative Work does not include any
+ > work licensed under the GPL other than the Program; You distribute
+ > Independent Works subject to a license listed in the section below
+ > titled "FOSS License List"; You distribute Independent Works in
+ > object code or executable form with the complete corresponding
+ > machine-readable source code on the same medium and under the same
+ > FOSS license applying to the object code or executable forms; All
+ > works that are aggregated with the Program or the Derivative Work
+ > on a medium or volume of storage are not derivative works of the
+ > Program, Derivative Work or FOSS Application, and must reasonably
+ > be considered independent and separate works.  Oracle reserves all
+ > rights not expressly granted in these terms and conditions. If all
+ > of the above conditions are not met, then this FOSS License Exception
+ > does not apply to you or your Derivative Work.
+ > .
+ > FOSS License List
+ > . 
+ > License Name    Version(s)/Copyright Date
+ > Release Early    Certified Software
+ > Academic Free License    2.0
+ > Apache Software License  1.0/1.1/2.0
+ > Apple Public Source License  2.0
+ > Artistic license     From Perl 5.8.0
+ > BSD license  "July 22 1999"
+ > Common Development and Distribution License (CDDL)   1.0
+ > Common Public License    1.0
+ > Eclipse Public License   1.0
+ > European Union Public License (EUPL)[1]    1.1
+ > GNU Library or "Lesser" General Public License (LGPL)    2.0/2.1/3.0
+ > GNU General Public License (GPL)     3.0
+ > IBM Public License   1.0
+ > Jabber Open Source License   1.0
+ > MIT License (As listed in file MIT-License.txt)  -
+ > Mozilla Public License (MPL)     1.0/1.1
+ > Open Software License    2.0
+ > OpenSSL license (with original SSLeay license)   "2003" ("1998")
+ > PHP License  3.0/3.01
+ > Python license (CNRI Python License)     -
+ > Python Software Foundation License   2.1.1
+ > Sleepycat License   "1999"
+ > University of Illinois/NCSA Open Source License  -
+ > W3C License  "2001"
+ > X11 License  "2001"
+ > Zlib/libpng License  -
+ > Zope Public License  2.0
+ > [1] When an Independent Work is licensed under a "Compatible License"
+ > pursuant to the EUPL, the Compatible License rather than the EUPL is
+ > the applicable license for purposes of these FOSS License Exception
+ > Terms and Conditions.
+ .
+ The above text is subject to this copyright notice:
+ (C) 2010, Oracle and/or its affiliats.
+
+Files: *
+Copyright: 2009-2013 Percona LLC
+License: GPL-2
+
+Files: storage/HandlerSocket-Plugin-for-MySQL/*
+Copyright: Copyright (c) 2010 DeNA Co.,Ltd.
+License: BSD (3 clause)
+
+Files: UDF/src/*.cc
+Copyright: None, Public Domain
+License: PD
+
+Files: cmd-line-utils/libedit/config.h
+ dbug/example1.c
+ dbug/example2.c
+ dbug/example3.c
+ dbug/factorial.c
+ dbug/main.c
+ dbug/my_main.c
+ dbug/remove_function_from_trace.pl
+ dbug/tests.c
+ dbug/tests-t.pl
+ extra/yassl/src/dummy.cpp
+ include/probes_mysql_nodtrace.h
+ libmysqld/resource.h
+ mysql-test/*
+ regex/*
+ sql-bench/graph-compare-results.sh
+ storage/ndb/bin/*
+ storage/ndb/demos/*
+ support-files/binary-configure.sh
+ support-files/my-huge.cnf.sh
+ support-files/my-innodb-heavy-4G.cnf.sh
+ support-files/my-large.cnf.sh
+ support-files/my-medium.cnf.sh
+ support-files/my-small.cnf.sh
+ support-files/mysqld_multi.server.sh
+ support-files/mysql-log-rotate.sh
+ support-files/mysql.server-sys5.sh
+Copyright: UNKNOWN
+Comment: These files fall under the blanket license specified in the file
+ COPYING and README
+License: GPL-2
+ GPLv2 Disclaimer
+ For the avoidance of doubt, except that if any license choice
+ other than GPL or LGPL is available it will apply instead, 
+ Oracle elects to use only the General Public License version 2 
+ (GPLv2) at this time for any software where a choice of GPL 
+ license versions is made available with the language indicating 
+ that GPLv2 or any later version may be used, or where a choice 
+ of which version of the GPL is applied is otherwise unspecified.
+
+Files: BUILD/*
+ client/*
+ client/echo.c
+ client/get_password.c
+ cmake/*
+ dbug/dbug_add_tags.pl
+ extra/*
+ include/*
+ libmysql/*
+ libmysqld/*
+ libservices/*
+ mysql-test/include/have_perfschema.inc
+ mysql-test/include/have_perfschema.inc
+ mysql-test/lib/mtr_cases.pm
+ mysql-test/lib/mtr_gcov.pl
+ mysql-test/lib/mtr_gprof.pl
+ mysql-test/lib/mtr_io.pl
+ mysql-test/lib/mtr_match.pm
+ mysql-test/lib/mtr_misc.pl
+ mysql-test/lib/mtr_process.pl
+ mysql-test/lib/mtr_report.pm
+ mysql-test/lib/mtr_results.pm
+ mysql-test/lib/mtr_stress.pl
+ mysql-test/lib/mtr_unique.pm
+ mysql-test/lib/My/ConfigFactory.pm
+ mysql-test/lib/My/Config.pm
+ mysql-test/lib/My/CoreDump.pm
+ mysql-test/lib/My/File/*
+ mysql-test/lib/My/Find.pm
+ mysql-test/lib/My/Handles.pm
+ mysql-test/lib/My/Options.pm
+ mysql-test/lib/My/Platform.pm
+ mysql-test/lib/My/SafeProcess/Base.pm
+ mysql-test/lib/My/SafeProcess.pm
+ mysql-test/lib/My/SafeProcess/safe_kill_win.cc
+ mysql-test/lib/My/SafeProcess/safe_process.cc
+ mysql-test/lib/My/SafeProcess/safe_process.pl
+ mysql-test/lib/My/SafeProcess/safe_process_win.cc
+ mysql-test/lib/My/SysInfo.pm
+ mysql-test/lib/My/Test.pm
+ mysql-test/lib/t/*
+ mysql-test/lib/v1/mtr_cases.pl
+ mysql-test/lib/v1/mtr_gcov.pl
+ mysql-test/lib/v1/mtr_gprof.pl
+ mysql-test/lib/v1/mtr_im.pl
+ mysql-test/lib/v1/mtr_io.pl
+ mysql-test/lib/v1/mtr_match.pl
+ mysql-test/lib/v1/mtr_misc.pl
+ mysql-test/lib/v1/mtr_process.pl
+ mysql-test/lib/v1/mtr_report.pl
+ mysql-test/lib/v1/mtr_stress.pl
+ mysql-test/lib/v1/mtr_timer.pl
+ mysql-test/lib/v1/mtr_unique.pl
+ mysql-test/lib/v1/My/*
+ mysql-test/lib/v1/My/*
+ mysql-test/lib/v1/mysql-test-run.pl
+ mysql-test/mysql-stress-test.pl
+ mysql-test/mysql-test-run.pl
+ mysql-test/std_data/*
+ mysql-test/suite/perfschema/include/*
+ mysql-test/suite/perfschema_stress/include/*
+ mysql-test/suite/perfschema_stress/include/*
+ mysys/*
+ packaging/WiX/ca/*
+ plugin/audit_null/*
+ plugin/auth/*
+ plugin/daemon_example/*
+ plugin/fulltext/*
+ plugin/semisync/semisync_slave.cc
+ plugin/semisync/semisync_slave.h
+ scripts/*
+ sql/*
+ sql-common/*
+ storage/*
+ strings/*
+ support-files/config.huge.ini.sh
+ support-files/config.medium.ini.sh
+ support-files/config.small.ini.sh
+ support-files/MacOSX/Description.plist.sh
+ support-files/MacOSX/Info.plist.sh
+ support-files/MacOSX/StartupParameters.plist.sh
+ support-files/MySQL-shared-compat.spec.sh
+ support-files/mysql.spec.sh
+ support-files/ndb-config-2-node.ini.sh
+ tests/*
+ unittest/*
+ vio/*
+Copyright: 1979-2008 MySQL AB
+           1995-2010 MySQL AB Sun Microsystems Inc
+           1994-1997,2000-2011 Oracle and/or its affiliates.
+License: GPL-2
+
+Files: storage/innobase/*
+Copyright: 1994-2011 Innobase Oy.
+License: GPL-2
+
+Files: cmd-line-utils/readline/*
+Copyright: 1987-2006 Free Software Foundation Inc
+License: GPL-2+
+
+Files: cmd-line-utils/libedit/*
+Copyright: 1989-1990,1992-1993 The Regents of the University of California.
+License: BSD (3 clause)
+
+Files: cmd-line-utils/libedit/filecomplete.c
+ cmd-line-utils/libedit/filecomplete.h
+ cmd-line-utils/libedit/np/fgetln.c
+ cmd-line-utils/libedit/read.h
+ cmd-line-utils/libedit/readline.c
+ cmd-line-utils/libedit/readline/*
+Copyright: 1997-2001 The NetBSD Foundation Inc
+License: BSD (2 clause)
+ This code is derived from software contributed to The NetBSD Foundation
+ by Jaromir Dolecek.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+Files: client/completion_hash.h
+ scripts/mysqlaccess.sh
+ scripts/mysql_fix_extensions.sh
+ scripts/mysql_setpermission.sh
+ sql-bench/*
+ storage/myisam/ftbench/ft-test-run.sh
+ storage/myisam/mi_test_all.sh
+ storage/ndb/test/run-test/atrt-analyze-result.sh
+ storage/ndb/test/run-test/atrt-clear-result.sh
+ storage/ndb/test/run-test/atrt-gather-result.sh
+ storage/ndb/test/run-test/atrt-setup.sh
+ storage/ndb/test/run-test/make-config.sh
+ storage/ndb/test/run-test/make-html-reports.sh
+ storage/ndb/test/run-test/make-index.sh
+ storage/ndb/test/run-test/ndb-autotest.sh
+ strings/strxmov.c
+ strings/strxnmov.c
+ support-files/MacOSX/postflight.sh
+ support-files/MacOSX/preflight.sh
+Copyright: 2000-2009 MySQL AB Sun Microsystems Inc
+           2000-2007 MySQL AB
+License: LGPL
+
+Files: storage/archive/azio.c
+ storage/archive/azlib.h
+ zlib/*
+Copyright: 1995-2005 Jean-loup Gailly and Mark Adler
+License: zlib/libpng
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  .
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  .
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+Files: sql-bench/innotest1.sh
+ sql-bench/innotest1a.sh
+ sql-bench/innotest1b.sh
+ sql-bench/innotest2.sh
+ sql-bench/innotest2a.sh
+ sql-bench/innotest2b.sh
+Copyright: 2000-2002 Innobase Oy & MySQL AB
+Comment: These files fall under the blanket license specified in the file COPYING
+License: GPL-2
+
+Files: storage/innobase/btr/btr0sea.c
+ storage/innobase/include/log0log.h
+ storage/innobase/include/os0sync.h
+ storage/innobase/log/log0log.c
+ storage/innobase/row/row0sel.c
+Copyright: 1995-1997,2009-2010 Innobase Oy.
+ 2008-2009 Google Inc
+License: GPL-2
+
+Files: storage/innobase/btr/btr0cur.c
+ storage/innobase/buf/buf0buf.c
+ storage/innobase/include/sync0rw.h
+ storage/innobase/include/sync0sync.h
+ storage/innobase/sync/*
+Copyright: 1994-2011 Oracle and/or its affiliates.
+ 2008 Google Inc
+License: GPL-2
+
+Files: storage/myisam/rt_index.h
+ storage/myisam/rt_key.c
+ storage/myisam/rt_mbr.c
+ storage/myisam/rt_mbr.h
+ storage/myisam/sp_defs.h
+Copyright: 2000,2002-2006 MySQL AB & Ramil Kalimullin
+License: GPL-2
+
+Files: storage/innobase/include/ut0bh.h
+ storage/innobase/trx/trx0rseg.c
+ storage/innobase/ut/ut0bh.c
+ storage/innobase/ut/ut0ut.c
+Copyright: 1996,2010-2011 Oracle Corpn.
+License: GPL-2
+
+Files: plugin/semisync/semisync.cc
+ plugin/semisync/semisync.h
+ plugin/semisync/semisync_slave_plugin.cc
+Copyright: 2008 MySQL AB
+ 2007 Google Inc
+License: GPL-2
+
+Files: strings/ctype-bin.c
+ strings/ctype-eucjpms.c
+ strings/ctype-ujis.c
+Copyright: 2000,2002,2005-2011 Oracle and/or its affiliates. & [e-mail]
+License: LGPL
+ On Debian and systems the full text of the GNU Library General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2`
+
+Files: scripts/mysqld_safe.sh
+ support-files/mysql-multi.server.sh
+ support-files/mysql.server.sh
+Copyright: 1996 Abandoned TCX DataKonsult AB & Monty Program KB & Detron HB
+License: PD
+ This file is public domain and comes with NO WARRANTY of any kind
+
+Files: sql/sql_yacc.cc
+ sql/sql_yacc.h
+Copyright: 1984,1989-1990,2000-2006 Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: storage/innobase/include/pars0grm.h
+ storage/innobase/pars/pars0grm.c
+Copyright: 1995-2009 Innobase Oy.
+ 1984,1989-1990,2000-2004 Free Software Foundation Inc.
+License: GPL-2
+ As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+ This special exception was added by the Free Software Foundation
+ in version 1.24 of Bison.
+ .
+ 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.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+Files: storage/innobase/include/srv0srv.h
+ storage/innobase/srv/srv0start.c
+Copyright: 1995-1996,2010-2011 Innobase Oy.
+ 2008-2009 Google Inc
+ 2009 Percona Inc
+License: GPL-2
+
+Files: plugin/semisync/semisync_master.cc
+ plugin/semisync/semisync_master_plugin.cc
+Copyright: 2008-2009 MySQL AB Sun Microsystems Inc
+ 2007 Google Inc
+License: GPL-2
+
+Files: storage/innobase/include/os0file.h
+ storage/innobase/os/os0file.c
+Copyright: 1995-2010 Innobase Oy.
+ 2009 Percona Inc
+License: GPL-2
+
+Files: include/t_ctype.h
+ strings/t_ctype.h
+Copyright: 2000 MySQL AB
+ 1998 Theppitak Karoonboonyanan
+ 1998-1999 Pruet Boonma
+License: GPL-2
+
+Files: cmd-line-utils/libedit/np/strlcat.c
+ cmd-line-utils/libedit/np/strlcpy.c
+Copyright: 1998 Todd C. Miller <[e-mail]>
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
+ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
+ FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: sql/nt_servc.cc
+ sql/nt_servc.h
+Copyright: 1998 Abandoned Irena Pancirov - Irnet Snc
+License: PD
+ This file is public domain and comes with NO WARRANTY of any kind
+
+Files: dbug/dbug.c
+ dbug/dbug_long.h
+Copyright: 1987 Abandoned Fred Fish
+License: UNKNOWN
+ N O T I C E				      
+ .
+ Copyright Abandoned, 1987, Fred Fish		      
+ .
+ .
+ This previously copyrighted work has been placed into the  public     
+ domain	by  the  author  and  may be freely used for any purpose,     
+ private or commercial.						      
+ .
+ Because of the number of inquiries I was receiving about the  use     
+ of this product in commercially developed works I have decided to     
+ simply make it public domain to further its unrestricted use.	I     
+ specifically  would  be  most happy to see this material become a     
+ part of the standard Unix distributions by AT&T and the  Berkeley     
+ Computer  Science  Research Group, and a standard part of the GNU     
+ system from the Free Software Foundation.			      
+ .
+ I would appreciate it, as a courtesy, if this notice is  left  in     
+ all copies and derivative works.  Thank you.			      
+ .
+ The author makes no warranty of any kind  with	respect  to  this     
+ product  and  explicitly disclaims any implied warranties of mer-     
+ chantability or fitness for any particular purpose.		      
+
+Files: cmd-line-utils/libedit/np/vis.c
+Copyright: 1989-1993 The Regents of the University of California.
+ 1999-2005 The NetBSD Foundation Inc
+License: BSD (3 clause)
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+Files: scripts/dheadgen.pl
+Copyright: 2008-2009 Sun Microsystems Inc
+License: BSD (3 clause)
+
+Files: storage/ndb/test/src/getarg.c
+Copyright: 1997-2000 - Kungliga Tekniska Hogskolan
+License: BSD (3 clause)
+
+Files: storage/ndb/test/include/getarg.h
+Copyright: 2003 MySQL AB
+ 1997-1999 Kungliga Tekniska Hogskolan
+License: BSD (3 clause) GPL-2
+ 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.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
+ .
+ Copyright (c) 1997, 1999 Kungliga Tekniska Hogskolan
+ (Royal Institute of Technology, Stockholm, Sweden). 
+ All rights reserved. 
+ .
+ Redistribution and use in source and binary forms, with or without 
+ modification, are permitted provided that the following conditions 
+ are met: 
+ .
+ 1. Redistributions of source code must retain the above copyright 
+    notice, this list of conditions and the following disclaimer. 
+ .
+ 2. Redistributions in binary form must reproduce the above copyright 
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution. 
+ .
+ 3. Neither the name of the Institute nor the names of its contributors 
+    may be used to endorse or promote products derived from this software 
+    without specific prior written permission. 
+ .
+ THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ SUCH DAMAGE. 
+
+Files: storage/innobase/handler/ha_innodb.cc
+Copyright: 2008-2009 Google Inc
+ 2009 Percona Inc
+ 2000-2011 MySQL AB & Innobase Oy.
+License: GPL-2
+
+Files: plugin/semisync/semisync_master.h
+Copyright: 2008-2009 MySQL AB Sun Microsystems Inc
+ 2007 Google Inc
+License: GPL-2
+
+Files: storage/innobase/srv/srv0srv.c
+Copyright: 2008-2009 Google Inc
+ 1995-2011 Oracle and/or its affiliates.
+ 2009 Percona Inc
+License: GPL-2
+
+Files: storage/innobase/ut/ut0rbt.c
+Copyright: 2007-2010 Innobase Oy.
+ 2007 Oracle/Innobase Oy
+License: GPL-2
+
+Files: strings/ctype-win1250ch.c
+Copyright: 2002-2010 Oracle and/or its affiliates.
+ 2001 Jan Pazdziora
+License: GPL-2
+
+Files: strings/ctype-tis620.c
+Copyright: 1998 Theppitak Karoonboonyanan <[e-mail]>
+ 1989-1991 Samphan Raruenrom <[e-mail]>
+ 2000-2010 Oracle and/or its affiliates.
+ 2003 Sathit Jittanupat
+ 2001 Korakot Chaovavanich <[e-mail]> and
+ 1998-1999 Pruet Boonma <[e-mail]>
+License: GPL-2
+
+Files: storage/innobase/handler/ha_innodb.h
+Copyright: 2000-2010 MySQL AB & Innobase Oy.
+License: GPL-2
+
+Files: strings/dtoa.c
+Copyright: 2007-2010 Oracle and/or its affiliates.
+ 1991,2000-2001 Lucent Technologies
+License: LGPL
+
+Files: scripts/mysqldumpslow.sh
+Copyright: 2000-2002,2005-2009 MySQL AB Sun Microsystems Inc
+License: LGPL
+
+Files: libmysqld/lib_sql.cc
+Copyright: 2000 SWsoft  company
+License: SWsoft
+ This material is provided "as is", with absolutely no warranty expressed
+ or implied. Any use is at your own risk.
+ .
+ Permission to use or copy this software for any purpose is hereby granted 
+ without fee, provided the above notices are retained on all copies.
+ Permission to modify the code and to distribute modified code is granted,
+ provided the above notices are retained, and a notice that the code was
+ modified is included with the above copyright notice.
+
+Files: tests/mail_to_db.pl
+Copyright: 1998 Abandoned TCX DataKonsult AB & Monty Program KB & Detron HB
+License: PD
+ This file is public domain and comes with NO WARRANTY of any kind
+
+Files: dbug/dbug_analyze.c
+Copyright: 1987 June Binayak Banerjee
+License: PD
+ This program may be freely distributed under the same terms and
+ conditions as Fred Fish's Dbug package.
+
+Files: regex/regexp.c
+Copyright: 1986 University of Toronto
+License: BSD-like
+ Permission is granted to anyone to use this software for any
+ purpose on any computer system, and to redistribute it freely,
+ subject to the following restrictions:
+ .
+ 1. The author is not responsible for the consequences of use of
+        this software, no matter how awful, even if they arise
+    from defects in it.
+ .
+ 2. The origin of this software must not be misrepresented, either
+    by explicit claim or by omission.
+ .
+ 3. Altered versions must be plainly marked as such, and must not
+    be misrepresented as being the original software.
+
+License: PD
+ This software is in the Public Domain.
+
+License: GPL-2
+ 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+ .
+ On Debian and systems the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2`
+
+License: GPL-2+
+ This file is part of GNU Readline, a library for reading lines
+ of text with interactive input and history editing.
+ .
+ Readline 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; either version 2, or (at your option) any
+ later version.
+ .
+ Readline 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 Readline; see the file COPYING.  If not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+ .
+ On Debian and systems the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2`
+
+License: LGPL
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; version 2
+ of the License.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA
+ .
+ On Debian and systems the full text of the GNU Library General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2`
+
+License: BSD (3 clause)
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.

=== renamed file 'build/debian/libmysqlclient16-dev.README.Maintainer' => 'build-ps/debian/libperconaserverclient16-dev.README.Maintainer'
=== renamed file 'build/debian/libmysqlclient16-dev.dirs' => 'build-ps/debian/libperconaserverclient16-dev.dirs'
=== renamed file 'build/debian/libmysqlclient16-dev.docs' => 'build-ps/debian/libperconaserverclient16-dev.docs'
=== renamed file 'build/debian/libmysqlclient16-dev.examples' => 'build-ps/debian/libperconaserverclient16-dev.examples'
=== renamed file 'build/debian/libmysqlclient16-dev.files' => 'build-ps/debian/libperconaserverclient16-dev.files'
--- build/debian/libmysqlclient16-dev.files	2012-01-04 18:48:32 +0000
+++ build-ps/debian/libperconaserverclient16-dev.files	2013-12-13 06:18:17 +0000
@@ -1,9 +1,13 @@
 usr/bin/mysql_config
-usr/include/mysql/*.h
-usr/lib/libmysqlclient.a
-usr/lib/libmysqlclient.la
-usr/lib/mysql/*.a
-usr/lib/mysql/*.la
+usr/include/percona-server/*
+usr/lib/*/libperconaserverclient.a
+usr/lib/*/libperconaserverclient.so
+usr/lib/*/libperconaserverclient_r.a
+usr/lib/*/libperconaserverclient_r.so
+usr/lib/*/percona-server/plugin/ha_example.*
+usr/lib/*/percona-server/plugin/ha_*_plugin.a
+usr/lib/*/percona-server/plugin/ha_*_plugin.la
+usr/share/aclocal/mysql.m4
 usr/share/man/man1/mysql_config.1
 usr/lib/libhsclient.a
 usr/lib/libhsclient.la

=== renamed file 'build/debian/libmysqlclient16-dev.links' => 'build-ps/debian/libperconaserverclient16-dev.links'
--- build/debian/libmysqlclient16-dev.links	2012-01-04 18:48:32 +0000
+++ build-ps/debian/libperconaserverclient16-dev.links	2013-12-13 06:18:17 +0000
@@ -1,2 +1,2 @@
-usr/lib/libmysqlclient.so.16	usr/lib/libmysqlclient.so
-usr/lib/libmysqlclient_r.so.16	usr/lib/libmysqlclient_r.so
+usr/lib/libperconaserverclient.so.16	usr/lib/libperconaserverclient.so
+usr/lib/libperconaserverclient_r.so.16	usr/lib/libperconaserverclient_r.so

=== renamed file 'build/debian/libmysqlclient16.dirs' => 'build-ps/debian/libperconaserverclient16.dirs'
=== renamed file 'build/debian/libmysqlclient16.docs' => 'build-ps/debian/libperconaserverclient16.docs'
=== renamed file 'build/debian/libmysqlclient16.files' => 'build-ps/debian/libperconaserverclient16.files'
--- build/debian/libmysqlclient16.files	2010-05-31 13:57:21 +0000
+++ build-ps/debian/libperconaserverclient16.files	2013-12-13 06:18:17 +0000
@@ -1,1 +1,1 @@
-usr/lib/libmysqlclient*.so.*
+usr/lib/libperconaserverclient*.so.*

=== added file 'build-ps/debian/libperconaserverclient16.lintian-overrides'
--- build-ps/debian/libperconaserverclient16.lintian-overrides	1970-01-01 00:00:00 +0000
+++ build-ps/debian/libperconaserverclient16.lintian-overrides	2013-12-13 06:18:17 +0000
@@ -0,0 +1,4 @@
+# We are libmysqlclient, so of course we look like it.
+embedded-library binary: usr/lib/libperconaserverclient.so.16.0.0
+embedded-library binary: usr/lib/libperconaserverclient_r.so.16.0.0
+

=== renamed file 'build/debian/libmysqlclient16.postinst' => 'build-ps/debian/libperconaserverclient16.postinst'
=== modified file 'build-ps/debian/percona-server-client-5.1.lintian-overrides'
--- build/debian/percona-server-client-5.1.lintian-overrides	2010-05-31 13:57:21 +0000
+++ build-ps/debian/percona-server-client-5.1.lintian-overrides	2013-12-13 06:18:17 +0000
@@ -1,3 +1,10 @@
+embedded-library binary: usr/sbin/mysqlmanager
 percona-server-client-5.1: package-has-a-duplicate-relation
 percona-server-client-5.1: wrong-name-for-upstream-changelog usr/share/doc/percona-server-client-5.1/changelog.innotop.gz
 percona-server-client-5.1: pkg-not-in-package-test innotop
+percona-server-client-5.1: binary-without-manpage usr/bin/hsclient
+percona-server-client-5.1: binary-without-manpage usr/bin/mysqlanalyze
+percona-server-client-5.1: binary-without-manpage usr/bin/mysqloptimize
+percona-server-client-5.1: binary-without-manpage usr/bin/mysqlrepair
+percona-server-client-5.1: binary-without-manpage usr/bin/mysqlslap
+

=== modified file 'build-ps/debian/percona-server-server-5.1.dirs'
--- build/debian/percona-server-server-5.1.dirs	2010-05-31 13:57:21 +0000
+++ build-ps/debian/percona-server-server-5.1.dirs	2013-12-13 06:18:17 +0000
@@ -4,6 +4,6 @@
 usr/bin
 usr/sbin
 usr/share/man/man8
-usr/share/mysql
+usr/share/percona-server
 var/run/mysqld
 var/lib/mysql-upgrade

=== modified file 'build-ps/debian/percona-server-server-5.1.files'
--- build/debian/percona-server-server-5.1.files	2011-04-12 04:45:12 +0000
+++ build-ps/debian/percona-server-server-5.1.files	2013-12-13 06:18:17 +0000
@@ -1,4 +1,4 @@
-usr/lib/mysql/*so*
+usr/lib/percona-server/*so*
 etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
 usr/bin/innochecksum
@@ -52,6 +52,6 @@
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
 usr/share/man/man8/mysqld.8
-usr/share/mysql/
-usr/share/mysql-test/
-usr/lib/mysql/plugin/*
+usr/share/percona-server/
+usr/share/percona-server-test/
+usr/lib/percona-server/plugin/*.so

=== modified file 'build-ps/debian/percona-server-server-5.1.links'
--- build/debian/percona-server-server-5.1.links	2011-04-12 04:45:12 +0000
+++ build-ps/debian/percona-server-server-5.1.links	2013-12-13 06:18:17 +0000
@@ -1,2 +1,3 @@
-usr/share/mysql-test/mysql-test-run.pl usr/share/mysql-test/mysql-test-run
-usr/share/mysql-test/mysql-test-run.pl usr/share/mysql-test/mtr
+usr/share/percona-server-test/mysql-test-run.pl usr/share/percona-server-test/mysql-test-run
+usr/share/percona-server-test/mysql-test-run.pl usr/share/percona-server-test/mtr
+usr/share/percona-server usr/share/mysql

=== modified file 'build-ps/debian/percona-server-server-5.1.lintian-overrides'
--- build/debian/percona-server-server-5.1.lintian-overrides	2010-05-31 13:57:21 +0000
+++ build-ps/debian/percona-server-server-5.1.lintian-overrides	2013-12-13 06:18:17 +0000
@@ -1,4 +1,23 @@
+embedded-library binary: usr/sbin/mysqld
 percona-server-server-5.1: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
 percona-server-server-5.1: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
 percona-server-server-5.1: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
 percona-server-server-5.1: statically-linked-binary ./usr/sbin/mysqld
+percona-server-server-5.1: command-with-path-in-maintainer-script postinst:141 /bin/bash
+percona-server-server-5.1: command-with-path-in-maintainer-script postinst:195 /bin/echo
+percona-server-server-5.1: command-with-path-in-maintainer-script postinst:207 /bin/echo
+percona-server-server-5.1: command-with-path-in-maintainer-script postinst:216 /bin/echo
+percona-server-server-5.1: command-with-path-in-maintainer-script postinst:228 /bin/echo
+percona-server-server-5.1: command-with-path-in-maintainer-script preinst:53 /bin/echo
+percona-server-server-5.1: command-with-path-in-maintainer-script preinst:54 /bin/echo
+percona-server-server-5.1: script-not-executable usr/share/percona-server-test/lib/v1/mysql-test-run.pl
+percona-server-server-5.1: script-not-executable usr/share/percona-server-test/std_data/checkDBI_DBD-mysql.pl
+percona-server-server-5.1: script-not-executable usr/share/percona-server-test/suite/engines/rr_trx/run_stress_tx_rr.pl
+percona-server-server-5.1: script-not-executable usr/share/percona-server-test/suite/funcs_1/lib/DataGen_local.pl
+percona-server-server-5.1: script-not-executable usr/share/percona-server-test/suite/funcs_1/lib/DataGen_modify.pl
+percona-server-server-5.1: script-not-executable usr/share/percona-server-test/suite/funcs_2/lib/gen_charset_utf8.pl
+percona-server-server-5.1: script-not-executable usr/share/percona-server-test/t/backup-master.sh
+extra-license-file usr/share/doc/percona-server-server-5.1/COPYING.gz
+extra-license-file usr/share/doc/percona-server-server-5.1/COPYING.innodb-deadlock-count-patch
+extra-license-file usr/share/doc/percona-server-server-5.1/COPYING.show_temp_51
+

=== modified file 'build-ps/debian/percona-server-server-5.1.postinst'
--- build/debian/percona-server-server-5.1.postinst	2011-03-18 15:03:47 +0000
+++ build-ps/debian/percona-server-server-5.1.postinst	2013-12-13 06:18:17 +0000
@@ -61,7 +61,7 @@
     
 case "$1" in
   configure)
-    mysql_datadir=/usr/share/mysql
+    mysql_datadir=/usr/share/percona-server
     mysql_statedir=/var/lib/mysql
     mysql_rundir=/var/run/mysqld
     mysql_logdir=/var/log

=== modified file 'build-ps/debian/percona-server-server-5.1.postrm'
--- build/debian/percona-server-server-5.1.postrm	2010-05-31 13:57:21 +0000
+++ build-ps/debian/percona-server-server-5.1.postrm	2013-12-13 06:18:17 +0000
@@ -78,6 +78,6 @@
 fi
 # (normally) End automatically added section
 
-# no DEBHELPER here, "update-rc.d remove" fails if percona-server-server-5.1 is installed
+#DEBHELPER#
 
 exit 0

=== modified file 'build-ps/debian/rules'
--- build/debian/rules	2013-12-13 06:18:14 +0000
+++ build-ps/debian/rules	2013-12-13 06:18:17 +0000
@@ -3,37 +3,43 @@
 export DH_VERBOSE=1
 
 PACKAGE=percona-server-5.1
-
-include /usr/share/dpatch/dpatch.make
+PS_VERSION_EXTRA = $(shell echo "Percona Server (GPL), $(DEBVERSION)")
 
 TMP=$(CURDIR)/debian/tmp/
 
+<<<<<<< TREE
 major_version_default=14
 minor_version_default=9
 
+=======
+>>>>>>> MERGE-SOURCE
 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEBVERSION = $(shell echo "rel`if test -z \"$(major_version)\"; then echo ${major_version_default}; else echo $(major_version); fi`.`if test -z \"$(minor_version)\"; then echo ${minor_version_default}; else echo $(minor_version); fi`" )
+DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
+
+ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
+    USE_THIS_GCC_VERSION:=-4.4
+endif
+
+export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
+export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
 
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
 DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
-
-
-DISTRIBUTION = $(shell echo "Percona Server (GPL), `if test -z \"$(major_version)\"; then echo ${major_version_default}; else echo $(major_version); fi`.`if test -z \"$(minor_version)\"; then echo ${minor_version_default}; else echo $(minor_version); fi``if ! test -z \"$(BB_PERCONA_REVISION)\"; then echo \", Revision $(BB_PERCONA_REVISION)\"; fi`")
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+EXPORTED_SOURCE_TARBALL = debian/percona-server-source-5.1.tar.gz
+
+DISTRIBUTION = $(shell lsb_release -i -s)
 
 MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 ifeq (${MAKE_J}, -j0)
-  MAKE_J = -j4
-endif
-ifeq ($(MYSQL_BUILD_MAKE_JFLAG),)
-  MAKE_JFLAG = $(MAKE_J)
-else
-  MAKE_JFLAG = $(MYSQL_BUILD_MAKE_JFLAG)
+  MAKE_J = -j1
 endif
 
 MYSQL_SRC = $(shell pwd)
@@ -68,7 +74,6 @@
 ifneq ($(ARCH_OS),hurd)
 	if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi 
 endif
-	sh -c "./BUILD/autorun.sh"
 
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
@@ -89,7 +94,7 @@
 	        --mandir=/usr/share/man \
 		\
 		--with-server-suffix="-$(DEBVERSION)" \
-		--with-comment="($(DISTRIBUTION))" \
+		--with-comment="($(PS_VERSION_EXTRA))" \
 		--with-system-type="debian-linux-gnu" \
 		\
 		--enable-shared \
@@ -112,15 +117,12 @@
 		\
 		--without-embedded-server \
 		--with-embedded-privilege-control'
-		
-	#       --sysconfdir=/etc/mysql  -- Appends /etc/mysql after ~/ in the my.cnf search patch!
-	#
-	#	--with-debug
-	
 	touch configure-stamp
 
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
-build: build-stamp
 build-stamp: configure
 	dh_testdir
 
@@ -134,7 +136,6 @@
 	touch testsuite-stamp
 
 	touch build-stamp
-	
 
 clean: clean-patched unpatch
 	rm -rf debian/patched
@@ -145,7 +146,7 @@
 	rm -f configure-stamp
 	rm -f build-stamp
 	rm -f testsuite-stamp
-	
+
 	[ ! -f Makefile ] || $(MAKE) clean
 	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 
@@ -173,7 +174,6 @@
 	debconf-updatepo
 	dh_clean -v
 
-	
 install:
 install: build
 	@echo "RULES.install"
@@ -196,16 +196,15 @@
 	$(MAKE) install DESTDIR=$(TMP)/
 	# build HandlerSockect
 	cd storage/HandlerSocket-Plugin-for-MySQL && \
-	./autogen.sh && \
 	CXX="$${HS_CXX:-g++}" ./configure --with-mysql-source="$(MYSQL_SRC)" \
 	--with-mysql-bindir="$(MYSQL_SRC)/scripts" \
-	--with-mysql-plugindir="/usr/lib/mysql/plugin" \
+	--with-mysql-plugindir="/usr/lib/percona-server/plugin" \
 	--libdir="/usr/lib" \
 	--prefix="/usr" && \
 	$(MAKE) $(MAKE_JFLAG)
 	cd storage/HandlerSocket-Plugin-for-MySQL && $(MAKE) install DESTDIR=$(TMP)/
 	# build Maatkit UDF
-	cd UDF/ && CXX="$${UDF_CXX:-g++}" ./configure --includedir=$(MYSQL_SRC)/include --libdir=/usr/lib/mysql/plugin && $(MAKE) all && $(MAKE) install DESTDIR=$(TMP)/
+	cd UDF/ && CXX="$${UDF_CXX:-g++}" ./configure --includedir=$(MYSQL_SRC)/include --libdir=/usr/lib/percona-server/plugin && $(MAKE) all && $(MAKE) install DESTDIR=$(TMP)/
 		
 	# After installing, remove rpath to make lintian happy.
 	set +e; \
@@ -216,8 +215,11 @@
 		| xargs --no-run-if-empty chrpath -d; \
 	set -e
 
+	# move the test dir
+	mv $(TMP)/usr/mysql-test $(TMP)/usr/share/percona-server-test
+
 	# libperconaserverclient: move shared libraries (but not the rest like libheap.a & co)
-	mv $(TMP)/usr/lib/mysql/libperconaserverclient* $(TMP)/usr/lib
+	mv $(TMP)/usr/lib/percona-server/libperconaserverclient* $(TMP)/usr/lib
 	perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libperconaserverclient.la
 	perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libperconaserverclient_r.la
 	# Check if our beloved versioned symbols are really there
@@ -227,8 +229,8 @@
 	fi     
 
 	# libperconaserverclient-dev: forgotten header file since 3.23.25?
-	cp include/my_config.h $(TMP)/usr/include/mysql/
-	cp include/my_dir.h $(TMP)/usr/include/mysql/
+	cp include/my_config.h $(TMP)/usr/include/percona-server/
+	cp include/my_dir.h $(TMP)/usr/include/percona-server/
 
 	# percona-server-common: We now provide our own config file.
 	install -d $(TMP)/etc/mysql
@@ -240,15 +242,15 @@
 	# percona-server-server
 	install -m 0755 scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
 	mkdir -p $(TMP)/usr/share/doc/percona-server-server-5.1/examples
-	mv $(TMP)/usr/share/mysql/*cnf 	    $(TMP)/usr/share/doc/percona-server-server-5.1/examples/
-	rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
-	       $(TMP)/usr/share/mysql/mysql-log-rotate \
-	       $(TMP)/usr/share/mysql/mysql.server \
-	       $(TMP)/usr/share/mysql/binary-configure
+	mv $(TMP)/usr/share/percona-server/*cnf 	    $(TMP)/usr/share/doc/percona-server-server-5.1/examples/
+	rm -vf $(TMP)/usr/share/percona-server/mi_test_all* \
+	       $(TMP)/usr/share/percona-server/mysql-log-rotate \
+	       $(TMP)/usr/share/percona-server/mysql.server \
+	       $(TMP)/usr/share/percona-server/binary-configure
 	nm -n sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-server-5.1/mysqld.sym.gz
-	install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
+	install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/percona-server/
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
-	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
+	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/percona-server/
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
 	cp debian/percona-server-common-5.1.lintian-overrides     $(TMP)/usr/share/lintian/overrides/percona-server-common-5.1
@@ -326,18 +328,6 @@
 
 binary:	binary-indep binary-arch
 
-get-orig-source:
-	@wget -nv -T10 -t3 \
-	  -O /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz \
-	  http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/mysql-$(DEB_UPSTREAM_VERSION).tar.gz
-	@tar xfz /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz -C /tmp
-	@rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/Docs
-	@rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/debian
-	@mv /tmp/mysql-$(DEB_UPSTREAM_VERSION) /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
-	@cd /tmp ; tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
-	@rm -f /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz
-	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
-
 .PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch unpatch
 
 # vim: ts=8

=== added directory 'build-ps/debian/source'
=== added file 'build-ps/debian/source/format'
--- build-ps/debian/source/format	1970-01-01 00:00:00 +0000
+++ build-ps/debian/source/format	2013-12-13 06:18:17 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== modified file 'build-ps/percona-server.spec'
--- build/percona-server.spec	2013-12-13 06:18:14 +0000
+++ build-ps/percona-server.spec	2013-12-13 06:18:17 +0000
@@ -8,44 +8,29 @@
 # Some common macro definitions
 ##############################################################################
 
-# Required arguments
-# gotrevision - Revision in BZR branch
-
 %define mysql_vendor  Percona, Inc
-%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
+%define distrodescription %(lsb_release -ds)
 %define community 1
+<<<<<<< TREE
 %define mysqlversion 5.1.71
+=======
+%define mysqlversion 5.1.70
+>>>>>>> MERGE-SOURCE
 %define majorversion 14
+<<<<<<< TREE
 %define minorversion 9
 %define distribution  rhel%{redhatversion}
 %define release       rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
+=======
+%define minorversion 7
+%define psrelease %{majorversion}.%{minorversion}
+>>>>>>> MERGE-SOURCE
 
 %define mysqld_user	mysql
 %define mysqld_group	mysql
 %define mysqldatadir	/var/lib/mysql
 %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com
 
-# ------------------------------------------------------------------------------
-# Meta information, don't remove!
-# ------------------------------------------------------------------------------
-# norootforbuild
-
-# ------------------------------------------------------------------------------
-# On SuSE 9 no separate "debuginfo" package is built. To enable basic
-# debugging on that platform, we don't strip binaries on SuSE 9. We
-# disable the strip of binaries by redefining the RPM macro
-# "__os_install_post" leaving out the script calls that normally does
-# this. We do this in all cases, as on platforms where "debuginfo" is
-# created, a script "find-debuginfo.sh" will be called that will do
-# the strip anyway, part of separating the executable and debug
-# information into separate files put into separate packages.
-#
-# Some references (shows more advanced conditional usage):
-# http://www.redhat.com/archives/rpm-list/2001-November/msg00257.html
-# http://www.redhat.com/archives/rpm-list/2003-February/msg00275.html
-# http://www.redhat.com/archives/rhl-devel-list/2004-January/msg01546.html
-# http://lists.opensuse.org/archive/opensuse-commit/2006-May/1171.html
-# ------------------------------------------------------------------------------
 %define __os_install_post /usr/lib/rpm/brp-compress
 
 # ------------------------------------------------------------------------------
@@ -87,24 +72,9 @@
 %{?_without_libgcc:%define WITH_LIBGCC 0}
 
 
-# On SuSE 9 no separate "debuginfo" package is built. To enable basic
-# debugging on that platform, we don't strip binaries on SuSE 9. We
-# disable the strip of binaries by redefining the RPM macro
-# "__os_install_post" leaving out the script calls that normally does
-# this. We do this in all cases, as on platforms where "debuginfo" is
-# created, a script "find-debuginfo.sh" will be called that will do
-# the strip anyway, part of separating the executable and debug
-# information into separate files put into separate packages.
-#
-# Some references (shows more advanced conditional usage):
-# http://www.redhat.com/archives/rpm-list/2001-November/msg00257.html
-# http://www.redhat.com/archives/rpm-list/2003-February/msg00275.html
-# http://www.redhat.com/archives/rhl-devel-list/2004-January/msg01546.html
-# http://lists.opensuse.org/archive/opensuse-commit/2006-May/1171.html
-
 %define __os_install_post /usr/lib/rpm/brp-compress
 
-%define server_suffix  -rel%{majorversion}.%{minorversion}
+%define server_suffix  -%{psrelease}
 %define package_suffix -51
 %define ndbug_comment Percona Server (GPL), %{majorversion}.%{minorversion}, Revision %{gotrevision}
 %define debug_comment Percona Server - Debug (GPL), %{majorversion}.%{minorversion}, Revision %{gotrevision}
@@ -113,27 +83,33 @@
 
 %define BUILD_DEBUG 0
 
-%define lic_type GNU GPL v2
 %define lic_files COPYING README
-%define src_dir Percona-Server-%{mysqlversion}%{server_suffix}
 
 ##############################################################################
 # Main spec file section
 ##############################################################################
 
-Name:		Percona-Server%{package_suffix}
-Summary:	Percona-Server: a very fast and reliable SQL database server
-Group:		Applications/Databases
-Version:	%{mysqlversion}
-Release:	%{release}
-Distribution:	Red Hat Enterprise Linux %{redhatversion}
-License:    GPL	version 2 http://www.gnu.org/licenses/gpl-2.0.html
-Source:		Percona-Server-%{mysqlversion}%{server_suffix}.tar.gz
-URL:		http://www.percona.com/
-Packager:	%{mysql_vendor} Development Team <[e-mail]>
-Vendor:		%{mysql_vendor}
-Provides:	msqlormysql MySQL-server Percona-XtraDB-server
-BuildRequires:  gperf perl gcc-c++ ncurses-devel zlib-devel libtool automake autoconf time bison
+Name:	  Percona-Server%{package_suffix}
+Summary:  Drop-in MySQL replacement: fast and reliable
+Group:	  Applications/Databases
+Version:  %{mysqlversion}
+Release:  %{psrelease}.1%{?dist}
+License:  GPLv2
+Source:	  http://www.percona.com/downloads/Percona-Server-5.1/Percona-Server-%{mysqlversion}%{server_suffix}/source/percona-server-%{mysqlversion}%{server_suffix}.tar.gz
+URL:      http://www.percona.com/
+Provides: msqlormysql MySQL-server Percona-XtraDB-server
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: bison
+BuildRequires: gcc-c++
+BuildRequires: gperf
+BuildRequires: libtool
+BuildRequires: ncurses-devel
+BuildRequires: perl
+BuildRequires: time
+BuildRequires: openssl-devel
+BuildRequires: procps-ng
+BuildRequires: zlib-devel
 
 # Think about what you use here since the first step is to
 # run a rm -rf
@@ -154,7 +130,7 @@
 ##############################################################################
 
 %package -n Percona-Server-server%{package_suffix}
-Summary:	%{ndbug_comment} for Red Hat Enterprise Linux %{redhatversion}
+Summary:	%{ndbug_comment}
 Group:		Applications/Databases
 Requires:	Percona-Server-shared%{package_suffix} Percona-Server-client%{package_suffix} chkconfig coreutils shadow-utils grep procps
 Provides:	msqlormysql mysql-server MySQL-server Percona-XtraDB-server
@@ -239,7 +215,7 @@
 
 %prep
 
-%setup -n %{src_dir}
+%setup -n percona-server-%{mysqlversion}%{server_suffix}
 
 
 ##############################################################################
@@ -270,14 +246,6 @@
 echo "BUILD =================="
 echo $*
 
-MAKE_J=-j`if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi`
-if [ $MAKE_J = -j0 ]
-then
-  MAKE_J=-j4
-fi
-
-MAKE_JFLAG="${MAKE_JFLAG:-$MAKE_J}"
-
 # The --enable-assembler simply does nothing on systems that does not
 # support assembler speedups.
 sh -c  "CFLAGS=\"$CFLAGS\" \
@@ -311,26 +279,27 @@
 %endif
 	    $OPT_DEBUG \
 	    --with-readline \
-	    ; make $MAKE_JFLAG"
+	    ; make %{?_smp_mflags}"
 }
 # end of function definition "BuildMySQL"
 
 BuildHandlerSocket() {
 cd storage/HandlerSocket-Plugin-for-MySQL
 ./autogen.sh
-CXX=${HS_CXX:-g++} ./configure --with-mysql-source=$RPM_BUILD_DIR/%{src_dir} \
-	--with-mysql-bindir=$RPM_BUILD_DIR/%{src_dir}/scripts \
-	--with-mysql-plugindir=%{_libdir}/mysql/plugin \
+CXX=${HS_CXX:-g++} ./configure --with-mysql-source=../../ \
+	--with-mysql-bindir=../../scripts \
+	--with-mysql-plugindir=%{_libdir}/percona-server/plugin \
 	--libdir=%{_libdir} \
 	--prefix=%{_prefix}
-make $MAKE_JFLAG
+make %{?_smp_mflags}
 cd -
 }
 
 BuildUDF() {
+MYSQL_SOURCE=`pwd`
 cd UDF
-CXX=${UDF_CXX:-g++} ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include --libdir=%{_libdir}/mysql/plugin
-make $MAKE_JFLAG all
+CXX=${UDF_CXX:-g++} ./configure --includedir=$MYSQL_SOURCE/include --libdir=%{_libdir}/percona-server/plugin
+make %{?_smp_mflags} all
 cd -
 }
 # end of function definition "BuildHandlerSocket"
@@ -366,7 +335,7 @@
 done
 
 RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/%{src_dir}
+MBD=$RPM_BUILD_DIR/
 
 # Move the test suite to /usr/share/mysql
 sed -i 's@[$][(]prefix[)]@\0/share@' mysql-test/Makefile.am \
@@ -395,7 +364,8 @@
 # Include libgcc.a in the devel subpackage (BUG 4921)
 %if %{WITH_LIBGCC}
 libgcc=`$CC $CFLAGS --print-libgcc-file`
-install -m 644 "$libgcc" $RBR%{_libdir}/mysql/libmygcc.a
+mkdir -p $RBR%{_libdir}/percona-server/
+install -m 644 "$libgcc" $RBR%{_libdir}/percona-server/libmygcc.a
 %endif
 
 ##############################################################################
@@ -408,7 +378,7 @@
 ( BuildServer )   # subshell, so that CFLAGS + CXXFLAGS are modified only locally
 
 if [ "$MYSQL_RPMBUILD_TEST" != "no" ] ; then
-	MTR_BUILD_THREAD=auto make $MAKE_JFLAG %{DEBUG_TEST_MODE}
+	MTR_BUILD_THREAD=auto make %{?_smp_mflags} %{DEBUG_TEST_MODE}
 fi
 
 # Get the debug server and its .sym file from the build tree
@@ -417,8 +387,8 @@
 #else
 #	cp sql/mysqld       $RBR%{_sbindir}/mysqld-debug
 #fi
-#cp libmysqld/libmysqld.a    $RBR%{_libdir}/mysql/libmysqld-debug.a
-#cp sql/mysqld.sym           $RBR%{_libdir}/mysql/mysqld-debug.sym
+#cp libmysqld/libmysqld.a    $RBR%{_libdir}/percona-server/libmysqld-debug.a
+#cp sql/mysqld.sym           $RBR%{_libdir}/percona-server/mysqld-debug.sym
 
 %endif
 
@@ -430,7 +400,7 @@
 BuildHandlerSocket
 BuildUDF
 if [ "$MYSQL_RPMBUILD_TEST" != "no" ] ; then
-	MTR_BUILD_THREAD=auto make $MAKE_JFLAG %{NORMAL_TEST_MODE}
+	MTR_BUILD_THREAD=auto make %{?_smp_mflags} %{NORMAL_TEST_MODE}
 fi
 
 # Now, build plugin 
@@ -450,7 +420,7 @@
 
 %install
 RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/%{src_dir}
+MBD=$RPM_BUILD_DIR/percona-server-%{mysqlversion}%{server_suffix}
 
 # Move back the libdir from BUILD dir to BUILDROOT
 mkdir -p "$(dirname $RBR%{_libdir})"
@@ -460,12 +430,12 @@
 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}
 install -d $RBR%{_sbindir}
-install -d $RBR%{_libdir}/mysql/plugin
+install -d $RBR%{_libdir}/percona-server/plugin
 
 make DESTDIR=$RBR benchdir_root=%{_datadir} install
 cd storage/HandlerSocket-Plugin-for-MySQL
@@ -476,7 +446,7 @@
 cd -
 
 # install symbol files ( for stack trace resolution)
-#install -m644 $MBD/sql/mysqld.sym $RBR%{_libdir}/mysql/mysqld.sym
+#install -m644 $MBD/sql/mysqld.sym $RBR%{_libdir}/percona-server/mysqld.sym
 
 # Install logrotate and autostart
 install -m644 $MBD/support-files/mysql-log-rotate \
@@ -504,7 +474,7 @@
 
 # Install SELinux files in datadir
 install -m600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \
-	$RBR%{_datadir}/mysql/SELinux/RHEL4
+	$RBR%{_datadir}/percona-server/SELinux/RHEL4
 
 ##############################################################################
 #  Post processing actions, i.e. when installed
@@ -654,31 +624,6 @@
 SETARGETDIR=/etc/selinux/targeted/src/policy
 SEDOMPROG=$SETARGETDIR/domains/program
 SECONPROG=$SETARGETDIR/file_contexts/program
-if [ -f /etc/redhat-release ] && \
-   (grep -q "Red Hat Enterprise Linux .. release 4" /etc/redhat-release \
-    || grep -q "CentOS release 4" /etc/redhat-release) ; then
-   echo
-   echo
-   echo 'Notes regarding SELinux on this platform:'
-   echo '========================================='
-   echo
-   echo 'The default policy might cause server startup to fail because it is '
-   echo 'not allowed to access critical files. In this case, please update '
-   echo 'your installation. '
-   echo
-   echo 'The default policy might also cause inavailability of SSL related '
-   echo 'features because the server is not allowed to access /dev/random '
-   echo 'and /dev/urandom. If this is a problem, please do the following: '
-   echo 
-   echo '  1) install selinux-policy-targeted-sources from your OS vendor'
-   echo '  2) add the following two lines to '$SEDOMPROG/mysqld.te':'
-   echo '       allow mysqld_t random_device_t:chr_file read;'
-   echo '       allow mysqld_t urandom_device_t:chr_file read;'
-   echo '  3) cd to '$SETARGETDIR' and issue the following command:'
-   echo '       make load'
-   echo
-   echo
-fi
 
 if [ -x sbin/restorecon ] ; then
 	sbin/restorecon -R var/lib/mysql
@@ -796,17 +741,17 @@
 %endif
 %attr(755, root, root) %{_sbindir}/mysqlmanager
 %attr(755, root, root) %{_sbindir}/rcmysql
-#%attr(644, root, root) %{_libdir}/mysql/mysqld.sym
+#%attr(644, root, root) %{_libdir}/percona-server/mysqld.sym
 %if %{BUILD_DEBUG}
-#%attr(644, root, root) %{_libdir}/mysql/mysqld-debug.sym
+#%attr(644, root, root) %{_libdir}/percona-server/mysqld-debug.sym
 %endif
 
 %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/
 
-%attr(644, root, root) %{_libdir}/mysql/plugin/*
+%attr(644, root, root) %{_libdir}/percona-server/plugin/*
 
 %files -n Percona-Server-client%{package_suffix}
 %defattr(-, root, root, 0755)
@@ -852,36 +797,36 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
 %attr(755, root, root) %{_bindir}/mysql_config
 %dir %attr(755, root, root) %{_libdir}/mysql
-%{_includedir}/mysql
+%{_includedir}/percona-server
 %{_includedir}/handlersocket
 %{_datadir}/aclocal/mysql.m4
-%{_libdir}/mysql/libdbug.a
-%{_libdir}/mysql/libheap.a
+%{_libdir}/percona-server/libdbug.a
+%{_libdir}/percona-server/libheap.a
 %if %{WITH_LIBGCC}
-%{_libdir}/mysql/libmygcc.a
+%{_libdir}/percona-server/libmygcc.a
 %endif
-%{_libdir}/mysql/libmyisam.a
-%{_libdir}/mysql/libmyisammrg.a
-%{_libdir}/mysql/libperconaserverclient.a
-%{_libdir}/mysql/libperconaserverclient.la
-%{_libdir}/mysql/libperconaserverclient_r.a
-%{_libdir}/mysql/libperconaserverclient_r.la
-%{_libdir}/mysql/libmystrings.a
-%{_libdir}/mysql/libmysys.a
-%{_libdir}/mysql/libvio.a
-%{_libdir}/mysql/libz.a
-%{_libdir}/mysql/libz.la
+%{_libdir}/percona-server/libmyisam.a
+%{_libdir}/percona-server/libmyisammrg.a
+%{_libdir}/percona-server/libperconaserverclient.a
+%{_libdir}/percona-server/libperconaserverclient.la
+%{_libdir}/percona-server/libperconaserverclient_r.a
+%{_libdir}/percona-server/libperconaserverclient_r.la
+%{_libdir}/percona-server/libmystrings.a
+%{_libdir}/percona-server/libmysys.a
+%{_libdir}/percona-server/libvio.a
+%{_libdir}/percona-server/libz.a
+%{_libdir}/percona-server/libz.la
 %{_libdir}/libhsclient.a
 %{_libdir}/libhsclient.la
 
 %{_libdir}/*.so
-%{_libdir}/mysql/*.so
+%{_libdir}/percona-server/*.so
 
 %files -n Percona-Server-shared%{package_suffix}
 %defattr(-, root, root, 0755)
 # Shared libraries (omit for architectures that don't support them)
 %{_libdir}/*.so.*
-%{_libdir}/mysql/*.so.*
+%{_libdir}/percona-server/*.so.*
 
 %files -n Percona-Server-test%{package_suffix}
 %defattr(-, root, root, 0755)
@@ -891,632 +836,8 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1*
 
-##############################################################################
-# The spec file changelog only includes changes made to the spec file
-# itself - note that they must be ordered by date (important when
-# merging BK trees)
-##############################################################################
 %changelog
-* Wed May 22 2010 Aleksandr Kuzminsky <[e-mail]>
-
-Percona Server Release 11.0
-
-* Mon Mar 22 2010 Aleksandr Kuzminsky <[e-mail]>
-
-XtraDB Release 10
-
-* Thu Feb 11 2010 Aleksandr Kuzminsky <[e-mail]>
-
-Package name changed to Percona-XtraDB
-
-* Tue Jan 05 2010 Aleksandr Kuzminsky <[e-mail]>
-
-- Corrected emails
-- -m64 is removed from CFLAGS
-
-* Tue Apr 21 2009 Aleksandr Kuzminsky <[e-mail]>
-
-- Adoption for XtraDB Storage Engine
-
-* Fri Nov 07 2008 Joerg Bruehe <[e-mail]>
-
-- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
-  This should cover both gcc and icc flags.  Fixes bug#40546.
-
-* Mon Aug 18 2008 Joerg Bruehe <[e-mail]>
-
-- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
-  Some generated files aren't needed in RPMs:
-  - the "sql-bench/" subdirectory
-  Some files were missing:
-  - /usr/share/aclocal/mysql.m4  ("devel" subpackage)
-  - Manuals for embedded tests   ("test" subpackage)
-  - Manual "mysqlbug" ("server" subpackage)
-  - Manual "mysql_find_rows" ("client" subpackage)
-
-* Wed Jun 11 2008 Kent Boortz <[e-mail]>
-
-- Removed the Example storage engine, it is not to be in products
- 
-* Fri Apr 04 2008 Daniel Fischer <[e-mail]>
-
-- Added Cluster+InnoDB product
-
-* Mon Mar 31 2008 Kent Boortz <[e-mail]>
-
-- Made the "Federated" storage engine an option
-
-* Tue Mar 11 2008 Joerg Bruehe <[e-mail]>
-
-- Cleanup: Remove manual file "mysql_tableinfo.1".
-
-* Mon Feb 18 2008 Timothy Smith <[e-mail]>
-
-- Require a manual upgrade if the alread-installed mysql-server is
-  from another vendor, or is of a different major version.
-
-* Fri Dec 14 2007 Joerg Bruehe <[e-mail]>
-
-- Add the "%doc" directive for all man pages and other documentation;
-  also, some re-ordering to reduce differences between spec files.
-
-* Fri Dec 14 2007 Joerg Bruehe <[e-mail]>
-
-- Added "client/mysqlslap" (bug#32077)
- 
-* Wed Oct 31 2007 Joerg Bruehe <[e-mail]>
- 
-- Explicitly handle InnoDB using its own variable and "--with"/"--without"
-  options, because the "configure" default is "yes".
-  Also, fix the specification of "community" to include "partitioning".
- 
-* Mon Sep 03 2007 Kent Boortz <[e-mail]>
-
-- Let libmygcc be included unless "--without libgcc" is given.
-
-* Sun Sep 02 2007 Kent Boortz <[e-mail]>
-
-- Changed SSL flag given to configure to "--with-ssl"
-- Removed symbolic link "safe_mysqld"
-- Removed script and man page for "mysql_explain_log"
-- Removed scripts "mysql_tableinfo" and "mysql_upgrade_shell"
-- Removed "comp_err" from list to install
-- Removed duplicates of "libndbclient.a" and "libndbclient.la"
-
-* Tue Jul 17 2007 Joerg Bruehe <[e-mail]>
-
-- Add the man page for "mysql-stress-test.pl" to the "test" RPM
-  (consistency in fixing bug#21023, the script is handled by "Makefile.am")
-
-* Wed Jul 11 2007 Daniel Fischer <[e-mail]>
-
-- Change the way broken SELinux policies on RHEL4 and CentOS 4
-  are handled to be more likely to actually work
-
-* Thu Jun 05 2007 kent Boortz <[e-mail]>
-
-- Enabled the CSV engine in all builds
-
-* Thu May  3 2007 Mads Martin Joergensen <[e-mail]>
-
-- Spring cleanup
-
-* Thu Apr 19 2007 Mads Martin Joergensen <[e-mail]>
-
-- If sbin/restorecon exists then run it
-
-* Wed Apr 18 2007 Kent Boortz <[e-mail]>
-
-- Packed unpacked files
-
-   /usr/sbin/ndb_cpcd
-   /usr/bin/mysql_upgrade_shell
-   /usr/bin/innochecksum
-   /usr/share/man/man1/ndb_cpcd.1.gz
-   /usr/share/man/man1/innochecksum.1.gz
-   /usr/share/man/man1/mysql_fix_extensions.1.gz
-   /usr/share/man/man1/mysql_secure_installation.1.gz
-   /usr/share/man/man1/mysql_tableinfo.1.gz
-   /usr/share/man/man1/mysql_waitpid.1.gz
-
-- Commands currently not installed but that has man pages
-
-   /usr/share/man/man1/make_win_bin_dist.1.gz
-   /usr/share/man/man1/make_win_src_distribution.1.gz
-   /usr/share/man/man1/mysql-stress-test.pl.1.gz
-   /usr/share/man/man1/ndb_print_backup_file.1.gz
-   /usr/share/man/man1/ndb_print_schema_file.1.gz
-   /usr/share/man/man1/ndb_print_sys_file.1.gz
-
-* Thu Mar 22 2007 Joerg Bruehe <[e-mail]>
-
-- Add "comment" options to the test runs, for better log analysis.
-
-* Wed Mar 21 2007 Joerg Bruehe <[e-mail]>
-
-- Add even more man pages.
-
-* Fri Mar 16 2007 Joerg Bruehe <[e-mail]>
-
-- Build the server twice, once as "mysqld-debug" and once as "mysqld";
-  test them both, and include them in the resulting file.
-- Consequences of the fix for bug#20166:
-  Remove "mysql_create_system_tables",
-  new "mysql_fix_privilege_tables.sql" is included implicitly.
-
-* Wed Mar 14 2007 Daniel Fischer <[e-mail]>
-
-- Adjust compile options some more and change naming of community
-  cluster RPMs to explicitly say 'cluster'.
-
-* Mon Mar 12 2007 Daniel Fischer <[e-mail]>
-
-- Adjust compile options and other settings for 5.0 community builds.
-
-* Fri Mar 02 2007 Joerg Bruehe <[e-mail]>
-
-- Add several man pages which are now created.
-
-* Mon Jan 29 2007 Mads Martin Joergensen <[e-mail]>
-
-- Make sure SELinux works correctly. Files from Colin Charles.
-
-* Fri Jan 05 2007 Kent Boortz <[e-mail]>
-
-- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
-  correct "libgcc.a" path is returned for the 32/64 bit architecture.
-
-* Tue Dec 19 2006 Joerg Bruehe <[e-mail]>
-
-- The man page for "mysqld" is now in section 8.
-
-* Thu Dec 14 2006 Joerg Bruehe <[e-mail]>
-
-- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"
-  in the server RPM.
-- The "mysqlmanager" man page was relocated to section 8, reflect that.
-
-* Fri Nov 17 2006 Mads Martin Joergensen <[e-mail]>
-
-- Really fix obsoletes/provides for community -> this
-- Make it possible to not run test by setting
-  MYSQL_RPMBUILD_TEST to "no"
-
-* Wed Nov 15 2006 Joerg Bruehe <[e-mail]>
-
-- Switch from "make test*" to explicit calls of the test suite,
-  so that "report features" can be used.
-
-* Wed Nov 15 2006 Kent Boortz <[e-mail]>
-
-- Added "--with cluster" and "--define cluster{_gpl}"
-
-* Tue Oct 24 2006 Mads Martin Joergensen <[e-mail]>
-
-- Shared need to Provide/Obsolete mysql-shared
-
-* Mon Oct 23 2006 Mads Martin Joergensen <[e-mail]>
-
-- Run sbin/restorecon after db init (Bug#12676)
-
-* Thu Jul 06 2006 Joerg Bruehe <[e-mail]>
-
-- Correct a typing error in my previous change.
-
-* Tue Jul 04 2006 Joerg Bruehe <[e-mail]>
-
-- Use the Perl script to run the tests, because it will automatically check
-  whether the server is configured with SSL.
-
-* Wed Jun 28 2006 Joerg Bruehe <[e-mail]>
-
-- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
-  there are some more aspects which need to be solved before this is possible.
-  For now, just ensure the binary "mysql_upgrade" is delivered and installed.
-
-* Wed Jun 28 2006 Joerg Bruehe <[e-mail]>
-
-- Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).
-
-* Wed Jun 21 2006 Joerg Bruehe <[e-mail]>
-
-- To run "mysql_upgrade", we need a running server;
-  start it in isolation and skip password checks.
-
-* Sat May 23 2006 Kent Boortz <[e-mail]>
-
-- Always compile for PIC, position independent code.
-
-* Fri Apr 28 2006 Kent Boortz <[e-mail]>
-
-- Install and run "mysql_upgrade"
-
-* Sat Apr 01 2006 Kent Boortz <[e-mail]>
-
-- Allow to override $LDFLAGS
-
-* Fri Jan 06 2006 Lenz Grimmer <[e-mail]>
-
-- added a MySQL-test subpackage (BUG#16070)
-
-* Tue Dec 27 2005 Joerg Bruehe <[e-mail]>
-
-- Some minor alignment with the 4.1 version
-
-* Wed Dec 14 2005 Rodrigo Novo <[e-mail]>
-
-- Cosmetic changes: source code location & rpm packager
-- Protect "nm -D" against libtool weirdness
-- Add libz.a & libz.la to the list of files for subpackage -devel
-- moved --with-zlib-dir=bundled out of BuildMySQL, as it doesn't makes
-  sense for the shared package
-
-* Tue Nov 22 2005 Joerg Bruehe <[e-mail]>
-
-- Extend the file existence check for "init.d/mysql" on un-install
-  to also guard the call to "insserv"/"chkconfig".
-
-* Wed Nov 16 2005 Lenz Grimmer <[e-mail]>
-
-- added mysql_client_test to the "client" subpackage (BUG#14546)
-
-* Tue Nov 15 2005 Lenz Grimmer <[e-mail]>
-
-- changed default definitions to build a standard GPL release when not
-  defining anything else
-- install the shared libs more elegantly by using "make install"
-
-* Wed Oct 19 2005 Kent Boortz <[e-mail]>
-
-- Made yaSSL support an option (off by default)
-
-* Wed Oct 19 2005 Kent Boortz <[e-mail]>
-
-- Enabled yaSSL support
-
-* Thu Oct 13 2005 Lenz Grimmer <[e-mail]>
-
-- added a usermod call to assign a potential existing mysql user to the
-  correct user group (BUG#12823)
-- added a separate macro "mysqld_group" to be able to define the
-  user group of the mysql user seperately, if desired.
-
-* Fri Oct 1 2005 Kent Boortz <[e-mail]>
-
-- Copy the config.log file to location outside
-  the build tree
-
-* Fri Sep 30 2005 Lenz Grimmer <[e-mail]>
-
-- don't use install-strip to install the binaries (strip segfaults on
-  icc-compiled binaries on IA64)
-
-* Thu Sep 22 2005 Lenz Grimmer <[e-mail]>
-
-- allow overriding the CFLAGS (needed for Intel icc compiles)
-- replace the CPPFLAGS=-DBIG_TABLES with "--with-big-tables" configure option
-
-* Fri Aug 19 2005 Joerg Bruehe <[e-mail]>
-
-- Protect against failing tests.
-
-* Thu Aug 04 2005 Lenz Grimmer <[e-mail]>
-
-- Fixed the creation of the mysql user group account in the postinstall
-  section (BUG 12348)
-
-* Fri Jul 29 2005 Lenz Grimmer <[e-mail]>
-
-- Fixed external RPM Requirements to better suit the target distribution
-  (BUG 12233)
-
-* Fri Jul 15 2005 Lenz Grimmer <[e-mail]>
-
-- create a "mysql" user group and assign the mysql user account to that group
-  in the server postinstall section. (BUG 10984)
-
-* Wed Jun 01 2005 Lenz Grimmer <[e-mail]>
-
-- use "mysqldatadir" variable instead of hard-coding the path multiple times
-- use the "mysqld_user" variable on all occasions a user name is referenced
-- removed (incomplete) Brazilian translations
-- removed redundant release tags from the subpackage descriptions
-
-* Fri May 27 2005 Lenz Grimmer <[e-mail]>
-
-- fixed file list (removed libnisam.a and libmerge.a from the devel subpackage)
-- force running the test suite
-
-* Wed Apr 20 2005 Lenz Grimmer <[e-mail]>
-
-- Enabled the "blackhole" storage engine for the Max RPM
-
-* Wed Apr 13 2005 Lenz Grimmer <[e-mail]>
-
-- removed the MySQL manual files (html/ps/texi) - they have been removed
-  from the MySQL sources and are now available seperately.
-
-* Mon Apr 4 2005 Petr Chardin <[e-mail]>
-
-- old mysqlmanager, mysqlmanagerc and mysqlmanager-pwger renamed into
-  mysqltestmanager, mysqltestmanager and mysqltestmanager-pwgen respectively
-
-* Fri Mar 18 2005 Lenz Grimmer <[e-mail]>
-
-- Disabled RAID in the Max binaries once and for all (it has finally been
-  removed from the source tree)
-
-* Sun Feb 20 2005 Petr Chardin <[e-mail]>
-
-- Install MySQL Instance Manager together with mysqld, touch mysqlmanager
-  password file
-
-* Mon Feb 14 2005 Lenz Grimmer <[e-mail]>
-
-- Fixed the compilation comments and moved them into the separate build sections
-  for Max and Standard
-
-* Mon Feb 7 2005 Tomas Ulin <[e-mail]>
-
-- enabled the "Ndbcluster" storage engine for the max binary
-- added extra make install in ndb subdir after Max build to get ndb binaries
-- added packages for ndbcluster storage engine
-
-* Fri Jan 14 2005 Lenz Grimmer <[e-mail]>
-
-- replaced obsoleted "BuildPrereq" with "BuildRequires" instead
-
-* Thu Jan 13 2005 Lenz Grimmer <[e-mail]>
-
-- enabled the "Federated" storage engine for the max binary
-
-* Tue Jan 04 2005 Petr Chardin <[e-mail]>
-
-- ISAM and merge storage engines were purged. As well as appropriate
-  tools and manpages (isamchk and isamlog)
-
-* Thu Dec 31 2004 Lenz Grimmer <[e-mail]>
-
-- enabled the "Archive" storage engine for the max binary
-- enabled the "CSV" storage engine for the max binary
-- enabled the "Example" storage engine for the max binary
-
-* Thu Aug 26 2004 Lenz Grimmer <[e-mail]>
-
-- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
-
-* Fri Aug 20 2004 Lenz Grimmer <[e-mail]>
-
-- do not link statically on IA64/AMD64 as these systems do not have
-  a patched glibc installed
-
-* Tue Aug 10 2004 Lenz Grimmer <[e-mail]>
-
-- Added libmygcc.a to the devel subpackage (required to link applications
-  against the the embedded server libmysqld.a) (BUG 4921)
-
-* Mon Aug 09 2004 Lenz Grimmer <[e-mail]>
-
-- Added EXCEPTIONS-CLIENT to the "devel" package
-
-* Thu Jul 29 2004 Lenz Grimmer <[e-mail]>
-
-- disabled OpenSSL in the Max binaries again (the RPM packages were the
-  only exception to this anyway) (BUG 1043)
-
-* Wed Jun 30 2004 Lenz Grimmer <[e-mail]>
-
-- fixed server postinstall (mysql_install_db was called with the wrong
-  parameter)
-
-* Thu Jun 24 2004 Lenz Grimmer <[e-mail]>
-
-- added mysql_tzinfo_to_sql to the server subpackage
-- run "make clean" instead of "make distclean"
-
-* Mon Apr 05 2004 Lenz Grimmer <[e-mail]>
-
-- added ncurses-devel to the build prerequisites (BUG 3377)
-
-* Thu Feb 12 2004 Lenz Grimmer <[e-mail]>
-
-- when using gcc, _always_ use CXX=gcc 
-- replaced Copyright with License field (Copyright is obsolete)
-
-* Tue Feb 03 2004 Lenz Grimmer <[e-mail]>
-
-- added myisam_ftdump to the Server package
-
-* Tue Jan 13 2004 Lenz Grimmer <[e-mail]>
-
-- link the mysql client against libreadline instead of libedit (BUG 2289)
-
-* Mon Dec 22 2003 Lenz Grimmer <[e-mail]>
-
-- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
-
-* Fri Dec 13 2003 Lenz Grimmer <[e-mail]>
-
-- fixed file permissions (BUG 1672)
-
-* Thu Dec 11 2003 Lenz Grimmer <[e-mail]>
-
-- made testing for gcc3 a bit more robust
-
-* Fri Dec 05 2003 Lenz Grimmer <[e-mail]>
-
-- added missing file mysql_create_system_tables to the server subpackage
-
-* Fri Nov 21 2003 Lenz Grimmer <[e-mail]>
-
-- removed dependency on MySQL-client from the MySQL-devel subpackage
-  as it is not really required. (BUG 1610)
-
-* Fri Aug 29 2003 Lenz Grimmer <[e-mail]>
-
-- Fixed BUG 1162 (removed macro names from the changelog)
-- Really fixed BUG 998 (disable the checking for installed but
-  unpackaged files)
-
-* Tue Aug 05 2003 Lenz Grimmer <[e-mail]>
-
-- Fixed BUG 959 (libmysqld not being compiled properly)
-- Fixed BUG 998 (RPM build errors): added missing files to the
-  distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
-  mysql_fix_privilege_tables.1), removed "-n" from install section.
-
-* Wed Jul 09 2003 Lenz Grimmer <[e-mail]>
-
-- removed the GIF Icon (file was not included in the sources anyway)
-- removed unused variable shared_lib_version
-- do not run automake before building the standard binary
-  (should not be necessary)
-- add server suffix '-standard' to standard binary (to be in line
-  with the binary tarball distributions)
-- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir,
-  _datadir, _includedir) throughout the spec file.
-- allow overriding CC and CXX (required when building with other compilers)
-
-* Fri May 16 2003 Lenz Grimmer <[e-mail]>
-
-- re-enabled RAID again
-
-* Wed Apr 30 2003 Lenz Grimmer <[e-mail]>
-
-- disabled MyISAM RAID (--with-raid) - it throws an assertion which
-  needs to be investigated first.
-
-* Mon Mar 10 2003 Lenz Grimmer <[e-mail]>
-
-- added missing file mysql_secure_installation to server subpackage
-  (BUG 141)
-
-* Tue Feb 11 2003 Lenz Grimmer <[e-mail]>
-
-- re-added missing pre- and post(un)install scripts to server subpackage
-- added config file /etc/my.cnf to the file list (just for completeness)
-- make sure to create the datadir with 755 permissions
-
-* Mon Jan 27 2003 Lenz Grimmer <[e-mail]>
-
-- removed unused CC and CXX variables
-- CFLAGS and CXXFLAGS should honor RPM_OPT_FLAGS
-
-* Fri Jan 24 2003 Lenz Grimmer <[e-mail]>
-
-- renamed package "MySQL" to "MySQL-server"
-- fixed Copyright tag
-- added mysql_waitpid to client subpackage (required for mysql-test-run)
-
-* Wed Nov 27 2002 Lenz Grimmer <[e-mail]>
-
-- moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of 
-  Linux distributions now support this scheme as proposed by the LSB either
-  directly or via a compatibility symlink)
-- Use new "restart" init script action instead of starting and stopping
-  separately
-- Be more flexible in activating the automatic bootup - use insserv (on
-  older SuSE versions) or chkconfig (Red Hat, newer SuSE versions and
-  others) to create the respective symlinks
-
-* Wed Sep 25 2002 Lenz Grimmer <[e-mail]>
-
-- MySQL-Max now requires MySQL >= 4.0 to avoid version mismatches
-  (mixing 3.23 and 4.0 packages)
-
-* Fri Aug 09 2002 Lenz Grimmer <[e-mail]>
- 
-- Turn off OpenSSL in MySQL-Max for now until it works properly again
-- enable RAID for the Max binary instead
-- added compatibility link: safe_mysqld -> mysqld_safe to ease the
-  transition from 3.23
-
-* Thu Jul 18 2002 Lenz Grimmer <[e-mail]>
-
-- Reworked the build steps a little bit: the Max binary is supposed
-  to include OpenSSL, which cannot be linked statically, thus trying
-	to statically link against a special glibc is futile anyway
-- because of this, it is not required to make yet another build run
-  just to compile the shared libs (saves a lot of time)
-- updated package description of the Max subpackage
-- clean up the BuildRoot directory afterwards
-
-* Mon Jul 15 2002 Lenz Grimmer <[e-mail]>
-
-- Updated Packager information
-- Fixed the build options: the regular package is supposed to
-  include InnoDB and linked statically, while the Max package
-	should include BDB and SSL support
-
-* Fri May 03 2002 Lenz Grimmer <[e-mail]>
-
-- Use more RPM macros (e.g. infodir, mandir) to make the spec
-  file more portable
-- reorganized the installation of documentation files: let RPM
-  take care of this
-- reorganized the file list: actually install man pages along
-  with the binaries of the respective subpackage
-- do not include libmysqld.a in the devel subpackage as well, if we
-  have a special "embedded" subpackage
-- reworked the package descriptions
-
-* Mon Oct  8 2001 Monty
-
-- Added embedded server as a separate RPM
-
-* Fri Apr 13 2001 Monty
-
-- Added mysqld-max to the distribution
-
-* Tue Jan 2  2001  Monty
-
-- Added mysql-test to the bench package
-
-* Fri Aug 18 2000 Tim Smith <[e-mail]>
-
-- Added separate libmysql_r directory; now both a threaded
-  and non-threaded library is shipped.
-
-* Wed Sep 28 1999 David Axmark <[e-mail]>
-
-- Added the support-files/my-example.cnf to the docs directory.
-
-- Removed devel dependency on base since it is about client
-  development.
-
-* Wed Sep 8 1999 David Axmark <[e-mail]>
-
-- Cleaned up some for 3.23.
-
-* Thu Jul 1 1999 David Axmark <[e-mail]>
-
-- Added support for shared libraries in a separate sub
-  package. Original fix by David Fox ([e-mail])
-
-- The --enable-assembler switch is now automatically disables on
-  platforms there assembler code is unavailable. This should allow
-  building this RPM on non i386 systems.
-
-* Mon Feb 22 1999 David Axmark <[e-mail]>
-
-- Removed unportable cc switches from the spec file. The defaults can
-  now be overridden with environment variables. This feature is used
-  to compile the official RPM with optimal (but compiler version
-  specific) switches.
-
-- Removed the repetitive description parts for the sub rpms. Maybe add
-  again if RPM gets a multiline macro capability.
-
-- Added support for a pt_BR translation. Translation contributed by
-  Jorge Godoy <[e-mail]>.
-
-* Wed Nov 4 1998 David Axmark <[e-mail]>
-
-- A lot of changes in all the rpm and install scripts. This may even
-  be a working RPM :-)
-
-* Sun Aug 16 1998 David Axmark <[e-mail]>
-
-- A developers changelog for MySQL is available in the source RPM. And
-  there is a history of major user visible changed in the Reference
-  Manual.  Only RPM specific changes will be documented here.
+* Thu Dec 12 2013 Stewart Smith <[e-mail]>
+
+Percona Server 5.1.70-14.8
+

=== removed file 'build/debian/percona-server-client-5.1.menu'
--- build/debian/percona-server-client-5.1.menu	2010-05-31 13:57:21 +0000
+++ build/debian/percona-server-client-5.1.menu	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-# According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
-?package(innotop):needs="text" section="Applications/Data Management"\
-  title="innotop" command="/usr/bin/innotop"

=== modified file 'configure.in'
--- Percona-Server/configure.in	2013-12-13 06:18:14 +0000
+++ configure.in	2013-12-13 06:18:17 +0000
@@ -12,7 +12,11 @@
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
+<<<<<<< TREE
 AC_INIT([MySQL Server], [5.1.72], [], [mysql])
+=======
+AC_INIT([Percona Server], [5.1.70-14.7], [], [percona-server])
+>>>>>>> MERGE-SOURCE
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

=== renamed directory 'doc' => 'doc'
=== removed file 'handlersocket.patch'
--- handlersocket.patch	2012-11-06 21:14:08 +0000
+++ handlersocket.patch	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-diff -Naur a/HandlerSocket-Plugin-for-MySQL/configure.ac b/HandlerSocket-Plugin-for-MySQL/configure.ac
---- a/HandlerSocket-Plugin-for-MySQL/configure.ac
-+++ b/HandlerSocket-Plugin-for-MySQL/configure.ac
-@@ -4,6 +4,7 @@
- #AC_PREREQ([2.63b])
- AC_INIT([handlersocket-plugin], [1.0.6], [https://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL/issues])
- AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_AUX_DIR([.])
- AM_INIT_AUTOMAKE([-Wall -Werror foreign])
- AC_CONFIG_SRCDIR([libhsclient/fatal.cpp])
- AC_CONFIG_MACRO_DIR([m4])
-@@ -104,14 +105,10 @@
-   AC_ARG_WITH([mysql-plugindir],
-     [AS_HELP_STRING([--with-mysql-plugindir=PATH], [MySQL plugin directory where handlersocket.so to be copied])],
-     [
--      ac_mysql_plugin_dir=`cd $withval && pwd`
--      if test -d "$ac_mysql_plugin_dir/" ; then
--        PLUGIN_DIR="$ac_mysql_plugin_dir"
--        AC_SUBST(PLUGIN_DIR)
--        AC_MSG_RESULT([yes: Using $ac_mysql_plugin_dir])
--      else
--        AC_MSG_ERROR([invalid MySQL plugin directory : $ac_mysql_plugin_dir])
--      fi
-+      ac_mysql_plugin_dir=`echo $withval`
-+      PLUGIN_DIR="$ac_mysql_plugin_dir"
-+      AC_SUBST(PLUGIN_DIR)
-+      AC_MSG_RESULT([yes: Using $ac_mysql_plugin_dir])
-     ],
-     [
-       LIB_DIR_TMP=`"$ac_mysql_config" --plugindir`

=== modified file 'include/Makefile.am'
--- Percona-Server/include/Makefile.am	2011-11-24 02:01:17 +0000
+++ include/Makefile.am	2013-12-13 06:18:17 +0000
@@ -41,7 +41,8 @@
 			my_libwrap.h my_stacktrace.h  welcome_copyright_notice.h \
                        my_atomic.h atomic/gcc_builtins.h atomic/generic-msvc.h \
 			atomic/nolock.h atomic/rwlock.h atomic/solaris.h \
-			atomic/x86-gcc.h
+			atomic/x86-gcc.h \
+			flashcache_ioctl.h
 
 EXTRA_DIST =        mysql.h.pp mysql/plugin.h.pp
 

=== renamed directory 'kewpie' => 'kewpie'
=== modified file 'mysql-test/r/percona_innodb_version.result'
--- Percona-Server/mysql-test/r/percona_innodb_version.result	2013-03-07 06:04:43 +0000
+++ mysql-test/r/percona_innodb_version.result	2013-12-13 06:18:17 +0000
@@ -1,3 +1,3 @@
 SELECT @@innodb_version;
 @@innodb_version
-5.1.x-x.x
+5.1.x-x.x-x.x

=== modified file 'mysql-test/t/percona_innodb_version.test'
--- Percona-Server/mysql-test/t/percona_innodb_version.test	2013-03-07 06:04:43 +0000
+++ mysql-test/t/percona_innodb_version.test	2013-12-13 06:18:17 +0000
@@ -4,5 +4,5 @@
 # Bug #917246: Unintentional change of innodb_version format in 5.1.60
 ########################################################################
 
---replace_regex /5\.1\.[0-9]+-[0-9]+\.[0-9]+/5.1.x-x.x/
+--replace_regex /5\.1\.[0-9]+-[0-9]+\.[0-9]+-[0-9]+\.[0-9]+/5.1.x-x.x-x.x/
 SELECT @@innodb_version;

=== renamed directory 'python-for-subunit2junitxml' => 'python-for-subunit2junitxml'
=== modified file 'sql/Makefile.am'
--- Percona-Server/sql/Makefile.am	2013-06-03 03:53:55 +0000
+++ sql/Makefile.am	2013-12-13 06:18:17 +0000
@@ -77,7 +77,8 @@
 			sql_plugin.h authors.h event_parse_data.h \
 			event_data_objects.h event_scheduler.h \
 			sql_partition.h partition_info.h partition_element.h \
-			contributors.h sql_servers.h
+			contributors.h sql_servers.h \
+			query_strip_comments.h
 
 mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 			item.cc item_sum.cc item_buff.cc item_func.cc \
@@ -151,7 +152,7 @@
 EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
 			nt_servc.cc nt_servc.h \
 			message.mc  message.h message.rc MSG00001.bin \
-			CMakeLists.txt
+			CMakeLists.txt patch_info.h.pl
 
 CLEANFILES =        	lex_hash.h sql_yacc.output link_sources
 DISTCLEANFILES =        $(EXTRA_PROGRAMS)

=== renamed directory 'HandlerSocket-Plugin-for-MySQL' => 'storage/HandlerSocket-Plugin-for-MySQL'
=== modified file 'storage/HandlerSocket-Plugin-for-MySQL/configure.ac'
--- HandlerSocket-Plugin-for-MySQL/configure.ac	2012-11-06 21:14:08 +0000
+++ storage/HandlerSocket-Plugin-for-MySQL/configure.ac	2013-12-13 06:18:17 +0000
@@ -4,6 +4,7 @@
 #AC_PREREQ([2.63b])
 AC_INIT([handlersocket-plugin], [1.0.6], [https://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL/issues])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_SRCDIR([libhsclient/fatal.cpp])
 AC_CONFIG_MACRO_DIR([m4])
@@ -43,7 +44,7 @@
           MYSQL_SOURCE_VERSION="$MYSQL_VERSION_MAJOR.$MYSQL_VERSION_MINOR.$MYSQL_VERSION_PATCH"
         else
           if test -f "$ac_mysql_source_dir/configure.in"; then
-            MYSQL_SOURCE_VERSION=`cat $ac_mysql_source_dir/configure.in | grep "\[[\(MariaDB\|MySQL\) Server\]]" | sed -e "s|.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+[[0-9a-zA-Z\_\-]]*\).*|\1|"`
+            MYSQL_SOURCE_VERSION=`cat $ac_mysql_source_dir/configure.in | grep '\[[\(Percona\|MariaDB\|MySQL\) Server\]]' |  sed -e "s|^.*\[[\([0-9]*\.[0-9]*\.[0-9]*[a-zA-Z0-9_\.-]*\)\]].*|\1|"`
           else
             AC_MSG_ERROR([invalid MySQL source directory: $ac_mysql_source_dir])
           fi
@@ -104,14 +105,10 @@
   AC_ARG_WITH([mysql-plugindir],
     [AS_HELP_STRING([--with-mysql-plugindir=PATH], [MySQL plugin directory where handlersocket.so to be copied])],
     [
-      ac_mysql_plugin_dir=`cd $withval && pwd`
-      if test -d "$ac_mysql_plugin_dir/" ; then
-        PLUGIN_DIR="$ac_mysql_plugin_dir"
-        AC_SUBST(PLUGIN_DIR)
-        AC_MSG_RESULT([yes: Using $ac_mysql_plugin_dir])
-      else
-        AC_MSG_ERROR([invalid MySQL plugin directory : $ac_mysql_plugin_dir])
-      fi
+      ac_mysql_plugin_dir=`echo $withval`
+      PLUGIN_DIR="$ac_mysql_plugin_dir"
+      AC_SUBST(PLUGIN_DIR)
+      AC_MSG_RESULT([yes: Using $ac_mysql_plugin_dir])
     ],
     [
       LIB_DIR_TMP=`"$ac_mysql_config" --plugindir`

=== renamed file 'subunit2junitxml' => 'subunit2junitxml'