Merge lp://staging/~stewart/percona-server/pkg-5.6 into lp://staging/percona-server/5.6

`--> grep 5.5 build-ps/debian/rules
# Also #659565
        mkdir -p $(TMP)/usr/share/doc/percona-server-5.5/examples
        mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/percona-server-5.5/examples/
        nm -n $(builddir)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-5.5/mysqld.sym.gz
        # FIXME install -D -m 644 debian/mysql-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mysql-5.5.py
          dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; \
        dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.5.13-1)'
        dh_strip --dbg-package=percona-server-5.5-dbg

it should be 5.6, no?

`--> grep -rn 5.5 build-ps | wc -l
676

Makefile-ps contains GXX=gcc line, which caused linker error

for debian build i's unable to use build-dpkg.sh script, please point it to Makefile-ps instead of Makefile

cmake options from Makefile-ps are used for building dpkg packages, so options from debian/rules file are completely ignored. for example, I saw an error, related to embedded library

Alexey Bychko <email address hidden> writes:
> `--> grep 5.5 build-ps/debian/rules
> # Also #659565
> mkdir -p $(TMP)/usr/share/doc/percona-server-5.5/examples
> mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/percona-server-5.5/examples/
> nm -n $(builddir)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-5.5/mysqld.sym.gz
> # FIXME install -D -m 644 debian/mysql-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mysql-5.5.py
> dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; \
> dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.5.13-1)'
> dh_strip --dbg-package=percona-server-5.5-dbg
>
>
> it should be 5.6, no?

Quite likely, yes. I'll need to fix that.

--
Stewart Smith

Alexey Bychko <email address hidden> writes:
> Makefile-ps contains GXX=gcc line, which caused linker error

I'm pretty sure Makefile-ps should be retired... I'm wondering what it
brings to the table that the build-ps/*sh scripts and the SPEC and
debian packaging don't.

--
Stewart Smith

Alexey Bychko <email address hidden> writes:
> for debian build i's unable to use build-dpkg.sh script, please point
> it to Makefile-ps instead of Makefile

We should probably just remove the build-dpkg.sh script, as with these
branches we're just left with the normal debian packaging process:
- extract source tarball,
- cp -r build-ps/debian .
- dpkg-buildpackage -S -k12345
- sbuild (or dput)

--
Stewart Smith

Alexey Bychko <email address hidden> writes:
> cmake options from Makefile-ps are used for building dpkg packages, so
> options from debian/rules file are completely ignored. for example, I
> saw an error, related to embedded library

Hrm... it really shouldn't be... I thought I had all of that taken away,
or is this from the build-dpkg.sh run?

--
Stewart Smith

Alexey Bychko <email address hidden> writes:
> `--> grep -rn 5.5 build-ps | wc -l
> 676

Now fixed (except for changelog and similar)

--
Stewart Smith

> Alexey Bychko <email address hidden> writes:
> > cmake options from Makefile-ps are used for building dpkg packages, so
> > options from debian/rules file are completely ignored. for example, I
> > saw an error, related to embedded library
>
> Hrm... it really shouldn't be... I thought I had all of that taken away,
> or is this from the build-dpkg.sh run?
>
> --
> Stewart Smith
build-dpkg.sh comtains something like "make clean all" for preparing compilation

In file included from murmur_udf.cc:43:
/root/rpmbuild/BUILD/percona-server-5.6.15-62.0/include/my_global.h:68:23: error: my_config.h: No such file or directory
In file included from fnv1a_udf.cc:111:
/root/rpmbuild/BUILD/percona-server-5.6.15-62.0/include/my_global.h:68:23: error: my_config.h: No such file or directory
In file included from fnv_udf.cc:116:
/root/rpmbuild/BUILD/percona-server-5.6.15-62.0/include/my_global.h:68:23: error: my_config.h: No such file or directory
/root/rpmbuild/BUILD/percona-server-5.6.15-62.0/include/my_global.h:719:2: error: #error "please add -DSTACK_DIRECTION=1 or -1 to your CPPFLAGS"
/root/rpmbuild/BUILD/percona-server-5.6.15-62.0/include/my_global.h:789:1: warning: "isnan" redefined
In file included from /root/rpmbuild/BUILD/percona-server-5.6.15-62.0/include/my_global.h:319,

Stewart, any updates here?

Same comments as for 5.5 +

- Why is percona_innodb_version test adjusted in an exact opposite of
  the 5.5 change, i.e. one "-x.x" removed from "5.6.x-x.x-x.x"?

debs are ok, so approved for merging

Consistent file_contents failure, e.g. http://jenkins.percona.com/job/percona-server-5.6-param/481/BUILD_TYPE=debug,Host=ubuntu-saucy-64bit/testReport/junit/%28root%29/main/file_contents/:

_StringException: Text attachment: traceback
------------
Comment:

Logfile:
CURRENT_TEST: main.file_contents
--- /mnt/workspace/percona-server-5.6-param/BUILD_TYPE/debug/Host/ubuntu-saucy-64bit/mysql-test/r/file_contents.result 2013-12-27 19:29:58.000000000 +0300
+++ /mnt/workspace/percona-server-5.6-param/BUILD_TYPE/debug/Host/ubuntu-saucy-64bit/build/mysql-test/var/3/log/file_contents.reject 2014-01-13 17:30:16.000000000 +0300
@@ -1,6 +1,6 @@

 Checking 'INFO_SRC' and 'INFO_BIN'
-INFO_SRC: Found MySQL version number / Found BZR revision id
+INFO_SRC: Found MySQL version number / No line 'revision-id: .....'
 INFO_BIN: Found 'Compiler ... used' line / Found 'Feature flags' line

 End of tests

mysqltest: Result length mismatch
------------

Laurynas Biveinis <email address hidden> writes:
> CURRENT_TEST: main.file_contents

fixed for 5.5 and 5.6, needed to revert our workaround.

--
Stewart Smith

The top-level README refers to 5.5.