bzr commit into mysql-5.5-mtr branch (bjorn.munch:3123) Bug#58282

[Bjorn Munch]

#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


Attachment: [text/bzr-bundle] bzr/[e-mail]