From: Bjorn Munch
Date: December 8 2010 1:56pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3123) Bug#58282
List-Archive: http://lists.mysql.com/commits/126323
X-Bug: 58282
Message-Id: <201012081356.oB8DuCgh000724@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0970059031=="

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

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

 3123 Bjorn Munch	2010-12-08
      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-11-24 20:09:08 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-12-08 13:54:35 +0000
@@ -3015,6 +3015,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.
@@ -4500,6 +4506,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


--===============0970059031==
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/libaio-55/
# testament_sha1: 210dd0abf6340593def1c2e60b557ae74bbc8674
# timestamp: 2010-12-08 14:56:12 +0100
# base_revision_id: bjorn.munch@stripped\
#   kjq5ca8bizxx5opr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb4IpBsAAdXfgEAQXWf//1IC
1IG////6UASje9Gds7u1obWnakJRBTVPzVP001TZU29EjETJ6mhjQamCD0hzAJpgEyGAAJgmAAAC
UTQAk9TQ1TaZEGm1ANGgZAACSQgU3qYFDR6jNIAeoGgAA0CSSaGU9Ggk2Rqp+FT8I0kemoMaRppo
aMPglpHm/PuF+fwUp2HqX6iJk3TGq1A6c3M3iti9zc4jEQxPUe4PAMih4HHJ97+/nUVT0xPd1YpP
Jhet1QzfWmsF+uBb+Tfe2R58NBw/hRTWo0uk89IZkiQhYfvjJIjqnAeOHlBxNodeEwdVqcfzy4ce
3YWPgj1HIoMB6gx2GDsNbNthcD3DEx4iWtdRZbPsuq/VGfSTrCY33rL9K3EvqlSKhK1qH7uUkCtk
3C5y2GEUJHBGpkSLCreVif0KDioq2JVRSXidYiJuqEeOsyxwgqgjTU4oFMcEKLbZxvWAsF7D91t0
jzMY0F3wnPZ4xzKy+eynKgsyJuzUTeUsIcJw8HCxIs2ShqMQPV077uU5ifOjoRLwTopqEYTPVkQ3
RdyXKaZimHlxNNZxzIXnWblQXIdHaYN5D+ERKEqxrsE0ccVcfJ4lWkLo8BKWR/CU/xI7E5aF66TJ
MYYF+rett1JtsfjDPNQ+/UnIsKsJHXU9TfvOtXCalg0njCdd/lIPWjzz2hHIrTDQxhHSr1bbYTxj
XY0oZ37FpU1Uahvs5kK7YWV7dLEXIsVgTCUl7Db2no2V8OGUXh9PXikQoZMfGgiQ8Ia4az4cT+Tj
7fA/e4sLdmlDHLY4yUGh1ZfQ5jY5NvPZW4x+80QbHQXQ2TqDtdUMGd8b1zddqLDaed6gvd8RaKYt
y2nTInpiUke6rDseIzvtF33ImHCiu8xpy16iV71QR0jEdtCufK5zMkakiuallJvU9MOmF9k141LW
UD1I9lfBg5naqmsnyO57D2V4jwSXTqz7STouocttnJuNrG8QT6DXmHthjjJbZ4Ttcu7+3FJiH/GB
I2ploOOGfhp7jg44bj4+F0BmKnitDSZSqq1uGNp7zZx4lJ34SW5jt4GDvJUmJeJ1iO7znrb5DAsg
oNX8D6A579DEGTzKWgzXen6JpQhkjkWmiePXIOdz9clV9Lkb9kNqUAkpBE6BnjpcryM+lSGBtHbB
IpWOS9mqN0IrMq+BaM4SBY4OQsikLJX9ccYMTtMcl6JpaXJDZk4JohDBGFlZgSmdQmXmT5CiYiW/
pqSNL6Vs07BXE8iA5PSJE4uGLp1CpkisG9R1UBy516sR6kpJ1iGZMB0ZJ6j3qOKRgM4JTFjo31OW
LwJtaReHH/Vq0FxKRZlcmjgVprlmpwZlAmY0K+K3lIpWKLypeI8LoFmeZ6sIDIiea6RQtyzGCnXN
AHFGnD2kSK7pDDJmJoHMMPDucB9eumtQV9yk4upsBz1Fc6zr8m8+oWri1oKMSG3YSOsZ2h0GyA7n
NemxS4u5wlryyJvSMSoWrimcQcqb3nh+az4wX01JF0FEWCt8potKyaoUiCPIWhHU1mSM81yI2GoU
T0eFCs3DFZv5C1++4GHcGyJWeJQR6Zh/xdyRThQkL4IpBsA=


--===============0970059031==--