bzr push into mysql-trunk branch (jonathan.perkin:3417 to 3418)

[Jonathan Perkin]

 3418 Jonathan Perkin	2011-09-20 [merge]
      Merge from mysql-5.5

    modified:
      cmake/mysql_version.cmake
      support-files/mysql.spec.sh
 3417 Marc Alff	2011-09-20
      Fixed build break when compiling without the performance schema net io instrumentation
      Fixed break in mtr --check-test when building without the performance schema

    modified:
      include/mysql/psi/mysql_socket.h
      mysql-test/include/mtr_check.sql
=== modified file 'cmake/mysql_version.cmake'
--- a/cmake/mysql_version.cmake	2011-06-30 15:50:45 +0000
+++ b/cmake/mysql_version.cmake	2011-09-20 15:49:37 +0000
@@ -94,8 +94,8 @@ ENDIF()
 IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
   SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mysql-${VERSION}")
 ENDIF()
-SET(CPACK_PACKAGE_CONTACT "MySQL Build Team <build@stripped>")
-SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc")
+SET(CPACK_PACKAGE_CONTACT "MySQL Release Engineering <mysql-build@stripped>")
+SET(CPACK_PACKAGE_VENDOR "Oracle Corporation")
 SET(CPACK_SOURCE_GENERATOR "TGZ")
 INCLUDE(cpack_source_ignore_files)
 

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2011-09-19 19:17:36 +0000
+++ b/support-files/mysql.spec.sh	2011-09-20 15:49:37 +0000
@@ -247,7 +247,7 @@ Distribution:   %{distro_description}
 License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
 Source:         http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
 URL:            http://www.mysql.com/
-Packager:       MySQL Build Team <build@stripped>
+Packager:       MySQL Release Engineering <mysql-build@stripped>
 Vendor:         %{mysql_vendor}
 Provides:       msqlormysql MySQL-server mysql
 BuildRequires:  %{distro_buildreq}

No bundle (reason: useless for push emails).