Merge lp:~ignacio-nin/percona-server/5.5-bug1079688 into lp:percona-server/5.5

[Ignacio Nin]

Fix for bug #1079688

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-05-28 07:02:56 +0000
+++ build/debian/rules	2013-05-29 20:37:34 +0000
@@ -60,7 +60,7 @@
 	echo "Configuring HandlerSocket"
 	cd storage/HandlerSocket-Plugin-for-MySQL && \
 	bash -x autogen.sh && \
-	CXX=g++ CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/release/include" \
+	CXX="$${HS_CXX:-g++}" CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/release/include" \
 		./configure --with-mysql-source=$(CURDIR) \
 			--with-mysql-bindir=$(CURDIR)/release/scripts \
 			--with-mysql-plugindir=$(prefix)/lib/mysql/plugin \
@@ -70,7 +70,7 @@
 	
 	# Build UDF
 	cd UDF && \
-	CXX=g++ CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/release/include" \
+	CXX="$${UDF_CXX:-g++}" CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/release/include" \
 		./configure --includedir=$(CURDIR)/include \
 			--libdir=$(prefix)/lib/mysql/plugin && \
 	make $(MAKE_JFLAG)