Merge lp:~abychko/percona-xtrabackup/bug1095972-2.1 into lp:percona-xtrabackup/2.1

[Alexey Bychko]

fix for bug 1095972
[*] changed dependency from abstract mysql to real /usr/bin/mysql file because rpm packages from Oracle no longer satisfy "mysql" which is required by the xtrabackup rpms

[Alexey Kopytov (akopytov)]

As mentioned in the bug report in 2.1 we do not need a dependency on the mysql client for percona-xtrabackup. However, the test suite in 2.1 still depends on the mysql client. Which means the 2.1 MP should add a dependency on /usr/bin/mysql to percona-xtrabackup-test rather than percona-xtrabackup.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

We removed support for built-in InnoDB (i.e. the "5.1" target) in 2.1. Which means any references to "5.1" and "xtrabackup_51" are just remnants and should be removed as well, rather than changed to innodb51/xtrabackup_plugin.

review: Needs Fixing

[Alexey Bychko (abychko)]

fixed. removed support for built-in InnoDB (5.1)

[Alexey Kopytov (akopytov)]

I see no reasons to comment out that code instead of literally removing it?

review: Needs Fixing

[Alexey Kopytov (akopytov)]

And what is xbstream-related stuff being removed/commented out?

[Alexey Bychko (abychko)]

xbstream and xtrabackup_plugin are related to innodb51 only. once 5.1 build was disabled - there is no xtrabackup_plugin or xbstream anymore

[Alexey Kopytov (akopytov)]

No, xbstream is not related to innodb51 and should stay. It is built regardless of arguments to build.sh, but resulting binaries are the same functionality-wise. So it doesn't matter which build configuration is used to produce xbstream for packaging.

[Alexey Kopytov (akopytov)]

Conflicts.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'src/Makefile'
--- src/Makefile	2013-03-11 19:11:29 +0000
+++ src/Makefile	2013-03-19 11:56:22 +0000
@@ -213,4 +213,4 @@
 	$(LIBARCHIVE_A) -o $(TARGET)
 
 clean:
-	rm -f $(XTRABACKUPCCOBJS) $(XTRABACKUPCOBJS) $(XBSTREAMOBJS) xtrabackup xtrabackup_* 
+	rm -f $(XTRABACKUPCCOBJS) $(XTRABACKUPCOBJS) $(XBSTREAMOBJS) $(XBCRYPTOBJS) xtrabackup xtrabackup_*

=== modified file 'utils/xtrabackup.spec'
--- utils/xtrabackup.spec	2013-03-11 19:11:29 +0000
+++ utils/xtrabackup.spec	2013-03-19 11:56:22 +0000
@@ -19,7 +19,6 @@
 URL: http://www.percona.com/software/percona-xtrabackup/
 Source: percona-xtrabackup-%{xtrabackup_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: mysql
 Provides: xtrabackup
 Obsoletes: xtrabackup
 BuildRequires: libaio-devel
@@ -32,6 +31,7 @@
 Group: Applications/Databases
 Requires: percona-xtrabackup
 AutoReqProv: no
+Requires: /usr/bin/mysql
 
 %description test
 This package contains the test suite for Percona Xtrabackup
@@ -61,12 +61,10 @@
 export CXX=$CC
 export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 
 export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\" -fno-exceptions" 
-AUTO_DOWNLOAD=yes ./utils/build.sh 5.1
-cp src/xtrabackup_51 src/xbstream src/xbcrypt .
 AUTO_DOWNLOAD=yes ./utils/build.sh xtradb
-cp src/xtrabackup .
+cp src/xtrabackup . 
 AUTO_DOWNLOAD=yes ./utils/build.sh xtradb55
-cp src/xtrabackup_55 .
+cp src/xtrabackup_55 src/xbstream src/xbcrypt .
 
 %install
 [ "%{buildroot}" != '/' ] && rm -rf %{buildroot}
@@ -78,7 +76,6 @@
 install -m 755 xtrabackup_55 %{buildroot}%{_bindir}
 install -m 755 innobackupex %{buildroot}%{_bindir}
 ln -s innobackupex %{buildroot}%{_bindir}/innobackupex-1.5.1
-install -m 755 xtrabackup_51 %{buildroot}%{_bindir}
 install -m 755 xbstream %{buildroot}%{_bindir}
 install -m 755 xbcrypt %{buildroot}%{_bindir}
 cp -R test %{buildroot}%{_datadir}/percona-xtrabackup-test
@@ -91,7 +88,6 @@
 %{_bindir}/innobackupex
 %{_bindir}/innobackupex-1.5.1
 %{_bindir}/xtrabackup
-%{_bindir}/xtrabackup_51
 %{_bindir}/xtrabackup_55
 %{_bindir}/xbstream
 %{_bindir}/xbcrypt