bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3770 to 3771)

[Bjorn Munch]

 3771 Bjorn Munch	2012-01-19
      Re-enable embedded in spec file

    modified:
      support-files/mysql.spec.sh
 3770 Bjorn Munch	2012-01-19
      Remove trailing spaces in memcached additions to MTR

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-01-19 12:23:18 +0000
+++ b/support-files/mysql.spec.sh	2012-01-19 14:57:45 +0000
@@ -362,7 +362,6 @@ This package contains the shared librari
 and applications need to dynamically load and use MySQL.
 
 # ----------------------------------------------------------------------------
-%if 0
 %package -n MySQL-Cluster-embedded%{product_suffix}
 Summary:        MySQL Cluster - embedded library
 Group:          Applications/Databases
@@ -381,7 +380,6 @@ The API is identical for the embedded My
 client/server version.
 
 For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
-%endif
 
 ##############################################################################
 %prep
@@ -538,8 +536,6 @@ install -m 644 "%{malloc_lib_source}" \
 # Remove man pages we explicitly do not want to package, avoids 'unpackaged
 # files' warning.
 # This has become obsolete:  rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
-rm -f $RBR%{_mandir}/man1/mysql_client_test_embedded.1*
-rm -f $RBR%{_mandir}/man1/mysqltest_embedded.1*
 
 ##############################################################################
 #  Post processing actions, i.e. when installed
@@ -1171,26 +1167,20 @@ echo "====="
 %defattr(-, root, root, 0755)
 %attr(-, root, root) %{_datadir}/mysql-test
 %attr(755, root, root) %{_bindir}/mysql_client_test
-%if 0
 %attr(755, root, root) %{_bindir}/mysql_client_test_embedded
 %attr(755, root, root) %{_bindir}/mysqltest_embedded
-%endif
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1*
-%if 0
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
-%endif
 
 # ----------------------------------------------------------------------------
-%if 0
 %files -n MySQL-Cluster-embedded%{product_suffix}
 %defattr(-, root, root, 0755)
 %attr(755, root, root) %{_bindir}/mysql_embedded
 %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
 %attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
-%endif
 
 ##############################################################################
 # The spec file changelog only includes changes made to the spec file
@@ -1198,6 +1188,10 @@ echo "====="
 # merging BK trees)
 ##############################################################################
 %changelog
+* Thu Jan 19 2012 Bjorn Munch <bjorn.munch@stripped>
+
+- Reinstate embedded, undoing the previous change
+
 * Fri Nov 25 2011 Jonathan Perkin <jonathan.perkin@stripped>
 
 - Remove embedded product and files, for now it is disabled.

No bundle (reason: useless for push emails).