bzr push into mysql-5.5 branch (joerg.bruehe:3572 to 3573)

[Joerg Bruehe]

 3573 Joerg Bruehe	2011-10-10
      Test "file_contents" failed in non-community RPMs on SuSE
      because the search pattern for the "INFO_*" files was not general enough:
      Fixed.

    modified:
      mysql-test/t/file_contents.test
 3572 Magne Mahre	2011-10-06
      Bug#12912112 MYSQL_CLIENT_TEST FAILS ON TEST_TRUNCATION 
             
      Sun Studio 12 has an error when calculating the compile-time 
      length of a constant character string.  The error is only 
      present when building an optimized 32-bits version, using 
      the -xbuiltin=(%all) compiler flag. 
             
      During compilation, the compiler recognizes the use of 
      the strlen() function used on a constant string. It 
      optimizes the strlen and replaces it with the actual 
      length of the string.   This optimization seems to 
      calculate the length wrongly in this particular case. 
             
      Replacing the "const char *" with a "const char []" 
      solves the problem. 

    modified:
      tests/mysql_client_test.c
=== modified file 'mysql-test/t/file_contents.test'
--- a/mysql-test/t/file_contents.test	2011-03-11 15:00:53 +0000
+++ b/mysql-test/t/file_contents.test	2011-10-10 12:03:29 +0000
@@ -15,9 +15,9 @@ if ($dir_bin =~ m|/usr/|) {
   # RPM package
   $dir_docs = $dir_bin;
   $dir_docs =~ s|/lib|/share/doc|;
-  if(-d "$dir_docs/packages/MySQL-server") {
-    # SuSE
-    $dir_docs = "$dir_docs/packages/MySQL-server";
+  if(-d "$dir_docs/packages") {
+    # SuSE: "packages/" in the documentation path
+    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";
@@ -25,9 +25,9 @@ if ($dir_bin =~ m|/usr/|) {
 } elsif ($dir_bin =~ m|/usr$|) {
   # RPM build during development
   $dir_docs = "$dir_bin/share/doc";
-  if(-d "$dir_docs/packages/MySQL-server") {
-    # SuSE
-    $dir_docs = "$dir_docs/packages/MySQL-server";
+  if(-d "$dir_docs/packages") {
+    # SuSE: "packages/" in the documentation path
+    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";

No bundle (reason: useless for push emails).