Author: Ignacio Nin
Revision Date: 2013-10-18 18:20:19 UTC

Merge from trunk in order to resolve conflicts

Author: Ignacio Nin
Revision Date: 2013-10-16 22:06:25 UTC

Remove the Obsoletes: lines from the shared package

Due to every version of Percona Server (5.1, 5.5, 5.6 and PXC) having a
shared library package that Obsoletes: mysql-libs, upgrading from a
mysql-libs installation would use any available version to obsolete
mysql-libs, when in fact the intended package to replace it is the 5.0
version for CentOS 5 and the 5.1 version for CentOS 6.

After installing the percona repository, a yum upgrade would try to
replace mysql-libs with Percona-XtraDB-Cluster-shared-compat, which
would confuse users.

Solve this by removing all the Obsoletes: lines from the packages that
are not intended to replace mysql-libs *except when explicitely
installed*, and in the correct packages only Obsolete: for the correct
versions of CentOS.

Author: Ignacio Nin
Revision Date: 2013-10-16 21:49:48 UTC

Remove the Obsoletes: lines from the shared package except for CentOS 6

Due to every version of Percona Server (5.1, 5.5, 5.6 and PXC) having a
shared library package that Obsoletes: mysql-libs, upgrading from a
mysql-libs installation would use any available version to obsolete
mysql-libs, when in fact the intended package to replace it is the 5.0
version for CentOS 5 and the 5.1 version for CentOS 6.

After installing the percona repository, a yum upgrade would try to
replace mysql-libs with Percona-XtraDB-Cluster-shared-compat, which
would confuse users.

Solve this by removing all the Obsoletes: lines from the packages that
are not intended to replace mysql-libs *except when explicitely
installed*, and in the correct packages only Obsolete: for the correct
versions of CentOS.

Author: Ignacio Nin
Revision Date: 2013-10-16 15:14:42 UTC

Move the Obsolete: lines to the shared package for CentOS 5

Due to every version of Percona Server (5.1, 5.5, 5.6 and PXC) having a
shared library package that Obsoletes: mysql-libs, upgrading from a
mysql-libs installation would use any available version to obsolete
mysql-libs, when in fact the intended package to replace it is the 5.0
version for CentOS 5 and the 5.1 version for CentOS 6.

After installing the percona repository, a yum upgrade would try to
replace mysql-libs with Percona-XtraDB-Cluster-shared-compat, which
would confuse users.

Solve this by removing all the Obsoletes: lines from the packages that
are not intended to replace mysql-libs *except when explicitely
installed*, and in the correct packages only Obsolete: for the correct
versions of CentOS.

Author: Ignacio Nin
Revision Date: 2013-09-30 21:38:21 UTC

Replace the debian init script with the script provided by source

Merge the change from 5.5.

Author: Ignacio Nin
Revision Date: 2013-09-30 21:08:52 UTC

Replace the debian init script with the script provided by source

The debian init script had some issues when it came to detecting the
server had been started -- it had a hardcoded 15 seconds wait (although
this could be overridden by my.cnf) and in order to detect a running
server it tried to login to it.

This came with issues when a) the startup time exceeded 15 seconds, which
is something that can easily happen with datasets of hundreds of gigs,
and b) if there was no user available for the init script to use, or the
user had been misconfigured somehow. Of course, these two possibilites
were true too often.

Replace the script with the one provided by MySQL, which uses a PID-file
based detection mechanism to check whether the server has been started or
stopped.

Given that the two init scripts share no common history (the previous one
came from the debian distribution), bzr rm and bzr add it to avoid
pointless conflicts. Merge this with the same fix for 5.1, and share the
file id with the corresponding file in that branch.

Author: Ignacio Nin
Revision Date: 2013-09-30 20:08:29 UTC

Replace the debian init script with the script provided by source

The debian init script had some issues when it came to detecting the
server had been started -- it had a hardcoded 15 seconds wait (although
this could be overridden by my.cnf) and in order to detect a running
server it tried to login to it.

This came with issues when a) the startup time exceeded 15 seconds, which
is something that can easily happen with datasets of hundreds of gigs,
and b) if there was no user available for the init script to use, or the
user had been misconfigured somehow. Of course, these two possibilites
were true too often.

Replace the script with the one provided by MySQL, which uses a PID-file
based detection mechanism to check whether the server has been started or
stopped.

Given that the two init scripts share no common history (the previous one
came from the debian distribution), bzr rm and bzr add it to avoid
pointless conflicts.

Author: Ignacio Nin
Revision Date: 2013-09-26 19:27:03 UTC

Compile against system readline

Instead of using bundled readline, use the system version of readline. Also
depend on readline for the BuildRequires in RPM and dpkg.

Author: Ignacio Nin
Revision Date: 2013-09-09 15:55:26 UTC

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Merge the fix from 5.5.

Author: Ignacio Nin
Revision Date: 2013-09-09 15:42:52 UTC

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Merge the fix from 5.5.

Author: Ignacio Nin
Revision Date: 2013-09-09 15:40:35 UTC

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Author: Ignacio Nin
Revision Date: 2013-09-09 15:36:34 UTC

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Author: Ignacio Nin
Revision Date: 2013-09-09 16:39:23 UTC

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Merge the fix from 2.1.

Author: Ignacio Nin
Revision Date: 2013-09-09 16:08:09 UTC

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Merge the fix from 2.0.

Author: Ignacio Nin
Revision Date: 2013-09-09 16:06:44 UTC

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Author: Ignacio Nin
Revision Date: 2013-06-29 01:35:50 UTC

Merge fix for bug #1191395.

This is pretty much a null merge for dpkg, but we're moving the
Build-Depends line up in order to help merges.

Author: Ignacio Nin
Revision Date: 2013-06-20 19:09:48 UTC

Merge changes done for issue #26684

Author: Ignacio Nin
Revision Date: 2013-06-10 20:06:18 UTC

Merge --epoch parameter (dpkg)

Merge the --epoch parameter addition in order to avoid future conflicts.

Author: Ignacio Nin
Revision Date: 2013-05-14 20:02:49 UTC

Merge bugfix for #1174426

Author: Ignacio Nin
Revision Date: 2013-05-02 07:04:53 UTC

Null merge for bug lp:1175447, only present in 5.1

Author: Ignacio Nin
Revision Date: 2013-04-30 21:26:50 UTC

Merge --epoch parameter from 5.5 (dpkg)

Author: Ignacio Nin
Revision Date: 2013-04-23 20:24:04 UTC

Merge fix for bug #1171759

Author: Ignacio Nin
Revision Date: 2013-04-20 10:00:59 UTC

Have libmysqlclient_r.so.18 point to libmysqlclient.so.18 (RPM)

For the RPM shared package, the libmysqlclient_r.so.18 symlink was
pointing to libmysqlclient.so instead of the versioned
libmysqlclient.so.18. Since libmysqlclient.so was moved to the devel
package, when installing the shared package the unversioned library was
not present and the symlink would not get installed.

Fix this by pointing the symlink to the versioned library, which is
included in the shared package as well.

Author: Ignacio Nin
Revision Date: 2013-04-19 01:53:42 UTC

Merge from 5.5 the capability to build out of source (binary builder)

The binary builder for PXC already had this capability, but this merge
makes the two builders more similar, while not making any changes to the
resulting binary.

Author: Ignacio Nin
Revision Date: 2013-04-19 15:27:43 UTC

Merge from 5.5 the capability to build out of source (binary builder)

Author: Ignacio Nin
Revision Date: 2013-04-18 19:43:39 UTC

Merge from 5.1 the capability to build out of source (binary builder)

This solves bug #1164699 since it leaves the source directory untouched.

Author: Ignacio Nin
Revision Date: 2013-03-25 20:03:14 UTC

ii

Author: Ignacio Nin
Revision Date: 2013-03-25 18:24:54 UTC

Add a percona-xtrabackup-docs deb package

Compile (via python-sphinx) the html documentation from the sources and
include it in a percona-xtrabackup-docs package.

We need to depend on python-sphinx for this.

Author: Ignacio Nin
Revision Date: 2013-03-15 17:08:52 UTC

Merge fix for bug #1011047

Author: Ignacio Nin
Revision Date: 2013-03-06 18:02:38 UTC

Merge the fix for the conflicting problem with Percona-Server-shared-51

Author: Ignacio Nin
Revision Date: 2013-03-05 16:12:31 UTC

Remove innodb_memcached_config.sql from bindir

The file innodb_memcached_config.sql was moved to share/ so remove it
from the binary file list.

Author: Ignacio Nin
Revision Date: 2013-03-04 19:44:15 UTC

Move libmysqlclient.so from the shared package to the devel package

This commit is part of a series of fixes in all the branches of Percona-Server
and Percona-XtraDB-Cluster, for which the goal is to stop including
libmysqlclient.so and libmysqlclient_r.so in the shared packages and include
it in the devel package.

Also, for rhel5, have the shared package obsolete mysql, which is the package
containing the libmysqlclient.so.15 library in the distribution.

Rationale:
Following the model of the upstream (MySQL) packages, a copy of the versioned
library -- libmysqlclient.so.15 for 5.0, libmysqlclient.so.16 for 51 and
libmysqlclient.so.18 for 5.5 -- was included in the shared package with name
libmysqlclient.so.

This creates the problem of making the library packages not compatible to each
other, making it impossible to have PS-shared-51 and PS-shared-55 installed at
the same time, for example. Upstream solved this problem by providing a
shared-compat package (which we also include), containing all the older
versions of the libraries.

This solution is acceptable for manual installation, however it doesn't play
good with our repositories. Since we include all of our software in the same
repository, there are many combinations possible that you can choose. As long
as the user stuck to a particular version, this wouldn't cause trouble -- but
it's impossible to avoid when installing a package that depends on a particular
libmysqlclient.so version, like php-mysql, or percona-toolkit (indirectly via
perl-DBD-mysql). In rhel6, these packages depend on the 5.1 version of the
library, so if Percona-Server-5.5 was installed, the shared package for the 5.1
version got selected by yum but it would conflict at the file level on
libmysqlclient.so. In rhel5 the situation would be even worse, since these
packages depend on the 5.0 version of the library, making 5.1 and 5.5 difficult
to install unless the user would select specifically
Percona-Server-shared-compat. Having 5.1 or 5.5 depend directly on
PS-shared-compat only introduced further problems.

The solution proposed hereby is to follow the model of the distributions, and
have the packages not install libmysqlclient.so, but only the versioned
libraries. The distro packages are prepared to link against the versioned
libraries only, so not having the unversioned libraries should not be a problem
for installing packages. The unversiones libraries are installed in the -devel
packages, since these are needed for linking new programs against it.

This way, PS 5.1, PS 5.5 and PXC can be installed alonside the shared package
for 5.0 (Percona-SQL-shared-50) in rhel5 and 5.1 (Percona-Server-shared-51) in
rhel6, allowing for any combination of software and seamless installs of
percona-toolkit or any other package that would depend on a specific package.

Author: Ignacio Nin
Revision Date: 2013-03-04 17:22:39 UTC

Merge for bug #1144777

Author: Ignacio Nin
Revision Date: 2013-02-18 22:13:20 UTC

Merge for 5.1-nonconflicting-libmysqlclient for testing purposes.

Author: Ignacio Nin
Revision Date: 2013-01-18 18:22:43 UTC

Merge of trunk at rev 375, preserving the build files

At revno 375 in trunk, the build scripts in build/ and Makefile were
overridden with the ones from Percona Server, losing their original
contents.

This commit is a merge from revno 375, but preserving this files, with
the intention of then remerging into trunk in order to recover these.

Author: Ignacio Nin
Revision Date: 2013-01-17 23:30:51 UTC

merged lp:~codership/codership-mysql/5.5-23 rev 3838

Author: Ignacio Nin
Revision Date: 2012-12-05 20:12:13 UTC

Merge the fix for bug #1055989

Author: Ignacio Nin
Revision Date: 2012-11-21 17:46:08 UTC

Merge change to percona-xtrabackup-test from 2.0

Author: Ignacio Nin
Revision Date: 2012-11-21 17:44:29 UTC

Make the percona-xtrabackup-test packages archictecture independent.

Since the percona-xtrabackup-test packages are only scripts, text, and
other architecture-independent files, create a noarch/all package instead
of having one per platform.

Author: Ignacio Nin
Revision Date: 2012-10-31 19:36:49 UTC

yy

Author: Ignacio Nin
Revision Date: 2012-10-22 22:15:56 UTC

Move the timeouts of the mysql init script to /etc/default

Create an /etc/default/mysql file with default timeouts for the start and
stop script in /etc/init.d. the init script will try to read the file and
if it has numeric values it will take these as defaults.

Author: Ignacio Nin
Revision Date: 2012-09-26 18:56:18 UTC

Add a --debug flag to the binary builder

Add a --debug flag that will create a build with the debug-enabled
binaries. Also add -debug to the binary tarball and directory, as well
as the comment, in case it is a debug build.

Author: Ignacio Nin
Revision Date: 2012-09-11 11:04:09 UTC

Build out of source (binary builder)

Instead of building in the source for the binary builder, export to
another directory and build there.

Author: Ignacio Nin
Revision Date: 2012-09-11 11:05:20 UTC

Build out of source (binary builder)

Instead of building in the source for the binary builder, export to
another directory and build there.

Author: Ignacio Nin
Revision Date: 2012-09-11 11:05:20 UTC

Build out of source (binary builder)

Instead of building in the source for the binary builder, export to
another directory and build there.

Author: Ignacio Nin
Revision Date: 2012-09-11 17:22:15 UTC

rewrite

Author: buildbot
Revision Date: 2012-09-10 17:53:20 UTC

Remove Obsoletes: from the Percona XtraDB Cluster packages.

This is done to prevent commands like "yum install mysql" to want to
install Percona XtraDB Cluster instead.

Author: buildbot
Revision Date: 2012-09-10 23:32:17 UTC

Move my_print_defaults to the client package in order not to conflict
with the mysql package from the centos repositories.

Have the shared package conflict with mysql-libs.

Author: buildbot
Revision Date: 2012-09-10 23:29:16 UTC

Move my_print_defaults to the client package in order not to conflict
with the mysql package from the centos repositories.

Have the shared package conflict with mysql-libs.
Have the server package require the client package.

Author: Ignacio Nin
Revision Date: 2012-06-22 00:12:40 UTC

Merge 5.5-bug1003776 fix in order to test

Author: Ignacio Nin
Revision Date: 2012-06-12 21:07:36 UTC

Conflict with the galera package in debian

Author: Ignacio Nin
Revision Date: 2012-04-16 14:20:10 UTC

Ability to specify the path to libboost_program_options.a

Add a bpostatic parameter to the scons script, so the full path to the
location of libboost_program_options.a can be specified. This is to
avoid having more hardcoded paths (/usr/lib, /usr/local/lib, etc.) in
garb/Sconscript.

Author: Ignacio Nin
Revision Date: 2012-01-05 00:06:29 UTC

Remove generic dpkg packages for percona-server-server and client

Remove the generic packages percona-server-server and
percona-server-client, which now live in higher version branches (5.1 and
5.5).

Update flags and some minor edits on the dpkg building script.

Author: Ignacio Nin
Revision Date: 2011-12-15 01:44:50 UTC

Merge from upstream

Author: Ignacio Nin
Revision Date: 2011-04-28 16:30:41 UTC

Merge changes from release branch

Merge changes from release branch in order to fix building issues.

Author: Ignacio Nin
Revision Date: 2010-09-01 16:06:40 UTC

Fix build on i386

A typo in a preprocessor macro prevented the software from being
built on non-64 bit architectures.