[Pkg-mysql-commits] r2057 - mysql-5.5/branches/experimental/debian

[Nicholas Bamber]

tags 659565 pending
thanks

Author: periapt
Date: 2012-03-21 19:36:41 +0000 (Wed, 21 Mar 2012)
New Revision: 2057

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/control
   mysql-5.5/branches/experimental/debian/rules
Log:
Switched on native AIO in linux builds (Closes: #659565)

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-03-20 22:32:09 UTC (rev 2056)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-03-21 19:36:41 UTC (rev 2057)
@@ -46,6 +46,7 @@
     and tweaked debian/rules so that only 'make test' is run on Hurd.
   * Tweaked debian/rules to make build logs verbose (Closes: #651003)
   * Refreshed patches
+  * Switched on native AIO in linux builds (Closes: #659565)
 
  -- Clint Byrum <clint at ubuntu.com>  Tue, 14 Feb 2012 11:48:47 -0800
 

Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control	2012-03-20 22:32:09 UTC (rev 2056)
+++ mysql-5.5/branches/experimental/debian/control	2012-03-21 19:36:41 UTC (rev 2057)
@@ -4,7 +4,7 @@
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert at tretkowski.de>,
  Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 8.1.3~), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 8.1.3~), file (>= 3.28), libaio-dev [linux-any], libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
 Standards-Version: 3.9.2
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2012-03-20 22:32:09 UTC (rev 2056)
+++ mysql-5.5/branches/experimental/debian/rules	2012-03-21 19:36:41 UTC (rev 2057)
@@ -62,7 +62,12 @@
 ifeq ($(STATIC_MYSQLD), 1)
     USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static
 endif
-		
+	
+# See http://blogs.innodb.com/wp/2010/04/innodb-performance-aio-linux/
+# Also #659565
+ifneq (,$(findstring linux-gnu,$(DEB_HOST_GNU_TYPE)))
+    USE_LINUX_NATIVE_AIO=-DLINUX_NATIVE_AIO=ON
+endif
 
 configure-stamp-pic: FORCE_FPIC_CFLAGS=-fPIC
 configure-stamp-pic: FORCE_FPIC=-DWITH_PIC=On -DINSTALL_LIBDIR=lib/mysql
@@ -92,6 +97,7 @@
 		-DWITH_READLINE=OFF \
 		-DWITH_LIBEDIT=OFF \
 		$(USE_STATIC_MYSQLD) \
+		$(USE_LINUX_NATIVE_AIO) \
 		-DWITH_SSL=yes \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \