[Commits] Rev 2911: fix the detection of disabled binlog in http://bazaar.launchpad.net/~maria-captains/maria/5.1/

serg at askmonty.org serg at askmonty.org
Tue Aug 17 01:39:47 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1/

------------------------------------------------------------
revno: 2911
revision-id: sergii at pisem.net-20100816224036-20bcuytnufi1wxb7
parent: sergii at pisem.net-20100816131727-rdjampfmze0465lb
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.1
timestamp: Tue 2010-08-17 02:40:36 +0400
message:
  fix the detection of disabled binlog
-------------- next part --------------
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-08-16 07:08:09 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-08-16 22:40:36 +0000
@@ -4738,8 +4738,8 @@ sub mysqld_arguments ($$$) {
     mtr_add_arg($args, "%s--log-output=table,file");
   }
 
-  # Check if "extra_opt" contains skip-log-bin
-  my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opts);
+  # Check if "extra_opt" contains --log-bin
+  my $skip_binlog= not grep /^--(loose-)?log-bin/, @$extra_opts;
 
   # Indicate to mysqld it will be debugged in debugger
   if ( $glob_debugger )



More information about the commits mailing list