Merge lp:~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138 into lp:~percona-dev/percona-server/release-5.5.11-20.2

[Oleg Tsarev]

Reasons of bug #764138:
1) File INFO_SRC (required for test file_contents.test) ommited in build.
2) Test file_contents.test search the INFO_SRC file in the MySQL-server-xxx dirs, but Percona-Server install to Percona-Server-server-xxx.

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2011-04-12 08:23:04 +0000
+++ build/percona-server.spec	2011-04-21 15:49:49 +0000
@@ -928,6 +928,7 @@
 %doc %{license_files_server}
 %endif
 %doc %{src_dir}/Docs/ChangeLog
+%doc %{src_dir}/Docs/INFO_SRC
 %doc release/support-files/my-*.cnf
 
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
 
=== modified file 'mysql-test.diff'
--- mysql-test.diff	2011-04-09 15:20:23 +0000
+++ mysql-test.diff	2011-04-21 15:49:49 +0000
@@ -1342,3 +1342,35 @@
 +++ b/mysql-test/suite/sys_vars/t/userstat_basic.test	2011-04-09 18:49:05.000000000 +0400
 @@ -0,0 +1 @@
 +SELECT @@global.userstat;
+diff -ruN a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
+--- a/mysql-test/t/file_contents.test	2011-03-31 16:36:16.000000000 +0300
++++ b/mysql-test/t/file_contents.test	2011-04-21 18:05:41.536912152 +0300
+@@ -15,22 +15,22 @@
+   # RPM package
+   $dir_docs = $dir_bin;
+   $dir_docs =~ s|/lib|/share/doc|;
+-  if(-d "$dir_docs/packages/MySQL-server") {
++  if(-d "$dir_docs/packages/Percona-Server-server") {
+     # SuSE
+-    $dir_docs = "$dir_docs/packages/MySQL-server";
++    $dir_docs = "$dir_docs/packages/Percona-Server-server";
+   } else {
+     # RedHat: version number in directory name
+-    $dir_docs = glob "$dir_docs/MySQL-server*";
++    $dir_docs = glob "$dir_docs/Percona-Server-server*";
+   }
+ } elsif ($dir_bin =~ m|/usr$|) {
+   # RPM build during development
+   $dir_docs = "$dir_bin/share/doc";
+-  if(-d "$dir_docs/packages/MySQL-server") {
++  if(-d "$dir_docs/packages/Percona-Server-server") {
+     # SuSE
+-    $dir_docs = "$dir_docs/packages/MySQL-server";
++    $dir_docs = "$dir_docs/packages/Percna-Server-server";
+   } else {
+     # RedHat: version number in directory name
+-    $dir_docs = glob "$dir_docs/MySQL-server*";
++    $dir_docs = glob "$dir_docs/Percona-Server-server*";
+   }
+ } else {
+   # tar.gz package, Windows, or developer work (in BZR)