From: Bjorn Munch
Date: December 9 2010 1:04pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3126) Bug#58282
List-Archive: http://lists.mysql.com/commits/126416
X-Bug: 58282
Message-Id: <201012091304.oB9D4xkd003395@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1772313684=="

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

#At file:///home/bm136801/my/debug-55/ based on revid:bjorn.munch@stripped

 3126 Bjorn Munch	2010-12-09
      Bug #58282 "mtr --mem" does not work on a machine with libaio installed
      Workaround: add --loose-skip-innodb-use-native-aio
      Only on linux if explicitly using --mem or setting $OPT_MEM

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-12-09 11:10:49 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-12-09 13:04:35 +0000
@@ -3030,6 +3030,12 @@ sub mysql_install_db {
   mtr_add_arg($args, "--lc-messages-dir=%s", $install_lang);
   mtr_add_arg($args, "--character-sets-dir=%s", $install_chsdir);
 
+  # On some old linux kernels, aio on tmpfs is not supported
+  # Remove this if/when Bug #58421 fixes this in the server
+  if ($^O eq "linux" && $opt_mem) {
+    mtr_add_arg($args, "--loose-skip-innodb-use-native-aio");
+  }
+
   # InnoDB arguments that affect file location and sizes may
   # need to be given to the bootstrap process as well as the
   # server process.
@@ -4515,6 +4521,13 @@ sub mysqld_arguments ($$$) {
     }
   }
 
+  # On some old linux kernels, aio on tmpfs is not supported
+  # Remove this if/when Bug #58421 fixes this in the server
+  if ($^O eq "linux" && $opt_mem)
+  {
+    mtr_add_arg($args, "--loose-skip-innodb-use-native-aio");
+  }
+
   if ( $mysql_version_id >= 50106 && !$opt_user_args)
   {
     # Turn on logging to file


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/debug-55/
# testament_sha1: 954e5c1492fcc3b915930a96351d9f599575a96f
# timestamp: 2010-12-09 14:04:59 +0100
# base_revision_id: bjorn.munch@stripped\
#   5gkn8xd0ur7uy4p7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaXJziEAAdjfgEAQXWf//1IC
1IG////6UASvXaKcmu5OPXsT27CVBU8mTE8pPJhJ4T1IDymnqANNDRiCUSTET2mUzU9TKbQmg00N
Gmh6gAAJKaCZBPST0R6hpqMTwiBoNAZACKUp4TTIaaQGmm1NBpoAAAACSSaKeDRMQk9oamZSeoGn
qeptTEeo0eoKOQysePiXgJ0ciqrE+ya4kIFpifjQHXXatVsalrlEOSLz8kbw5hrNRzLKo7o/HFhm
Onmer5hlcxU2qQVtgQ4E90xJibZV5jdroOP6UpLkixrHjdE+iQiiym/TYpDWnOQGIFBib49tVUxu
pv893Pf4aS4+Kg4ZOBgOIMZDBkNDFtBWD3DFQ8RJwUNC06f2uSNm0ktsjU9YeavF3mbRSMBLS6b3
XEA4dLJtjMWuEPSIFTk6x4YDhReRkI4bVFMYwMbi2VK2p+CJk85iN0sifCyGkLUwRkxMRiUbjPCj
C0L6D76IUqcuGKc0ZHzhCBwsjkHkLWLdLbnSG0EwjSRnMPKps2J5Rq4GI6vVto6lxmqJUOrAWs5N
Earp2c27GUteCeOHjC0HVOMHaUO6DAtq/av4X9I6OtVFm1D6CMiC8QVXTbU4D7NMxknS4sppMSmr
jY/FdIr2W4anJA1UZW/2YhXTZnFMmJpmHvTTjK7UuwGhHRV1rJSaQ18sIZSXr0NXRdqjsWF84g9w
pSLuiWt/K15Nj3C4ipbfJTyei662LnQzYsZOk6BMJWO9hl7zu1W6qvcO6/rz8Uh8zJjpkUj/F/V/
U6OJfs49Ynn87ywtz1IYwscUYG82xW0db2kBu+mfCqRfyleOMQ7sbBjwuydLeKl6LycvYiFF/Oii
iVajsG6gcaxKt+fYvLxMCtyDFrfQ8TBTcbotsQSNetjFVEL0QhAHLvHMN+NIbKq7nVlSTotlYyVH
lMb0a/IkFfyGyjC0jqOovMCplElBNp4yshY2m6OGa4wUuMGTUV5B+fUMtstmTZO7O8m78UPGgOBM
bCxCUXCifTPbeOUO6CVzIBKR9uYK2DyH8iKhJS1t+4ecNk6gxlcNwTzMOxR3LDvpFIZZ28BgXaER
T/h8QXbbQiN897Nbx4pp+zSi8wFAvUZGtwY1vuoUnStG3RLrFKFCoCYyDtt31rMPmqjLy448kjw+
Qq92IxGUK3oeJ37glCyQNRZUpGGJqar8PWbmWNNzArU+N7wzCINTcnFE5cYWGr7nZQSyFJb1OSR3
RQWrC0reeJAZPSIpjI7ExlRRxckTB3eNjZab4N6vIazga2TCkQwBwwOaZv8lBnUuIkCg6YOXO3jv
J/1TXDV/WNoPGzO02sVaDExa7XU4uCIZi9BoebA52e4aCrMQPGPeSBsymSijWbS+zEquedLuOkeF
OFiAYm+sciRJ2qwePWsMxw8MjYWisyjpVFjVXsVjeDQVF6bDd4u7uYXYGhdTtAOHkx+XGk1RIysu
ISjMxVGCjRYsEobPSYcCTTFtAOTQiyFMjPjlNnoc27dS+1SmOl7nXbNOGxNDYUmNlcBOmBNqar5i
iRrznmpaDMA4M4tgENg4cNOpiWLdycFwzPJMTtqD/F3JFOFCQpcnOIQ=


--===============1772313684==--