From: Sunanda Menon
Date: November 22 2010 1:04pm
Subject: bzr push into mysql-5.5-bugteam branch (sunanda.menon:3132)
List-Archive: http://lists.mysql.com/commits/124624
Message-Id: <20101122130441.3322.qmail@astra04>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2141615465=="

--===============2141615465==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3132 MySQL Build Team	2010-11-22 [merge]
      merge

    removed:
      win/README
      win/create_manifest.js
      win/mysql_manifest.cmake
    modified:
      sql/mdl.h
=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2010-11-19 23:20:18 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2010-11-22 10:35:48 +0000
@@ -122,7 +122,13 @@ IF(UNIX)
     CHECK_INCLUDE_FILES(libaio.h HAVE_LIBAIO_H)
     CHECK_LIBRARY_EXISTS(aio io_queue_init "" HAVE_LIBAIO)
     IF(NOT HAVE_LIBAIO_H OR NOT HAVE_LIBAIO)
-      MESSAGE(FATAL_ERROR "aio is required on Linux")
+      MESSAGE(FATAL_ERROR "
+      aio is required on Linux, you need to install the required library:
+
+        Debian/Ubuntu:              apt-get install libaio-dev
+        RedHat/Fedora/Oracle Linux: yum install libaio-devel
+        SuSE:                       zypper install libaio-devel
+       ")
     ENDIF()
   ENDIF()
 


--===============2141615465==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/build@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: build@stripped
# target_branch: file:///net/helheim/store/bteam/bzr/mysql-bug58227-\
#   5.5/
# testament_sha1: 5453cece2ede440f1d634f306b592c7777f0e26c
# timestamp: 2010-11-22 14:04:40 +0100
# base_revision_id: jon.hauglid@stripped\
#   n4ns3njeb8n9btw4
# 
# Begin bundle
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
5A==


--===============2141615465==--