bzr commit into mysql-next-mr branch (andrei.elkin:3186) WL#2540

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl2540/ based on revid:andrei.elkin@stripped

 3186 Andrei Elkin	2010-10-27
      wl#2540
      
      fixing sysvar suite. Each system var must have a test file in there. The tests are adeed.

    modified:
      mysql-test/suite/sys_vars/r/all_vars.result
      sql/sys_vars.cc
=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2010-10-26 16:06:43 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2010-10-27 10:19:49 +0000
@@ -14,17 +14,11 @@ INNODB_MONITOR_COUNTER_RESET
 INNODB_MONITOR_COUNTER_RESET_ALL
 INNODB_MONITOR_COUNTER_ON
 INNODB_MONITOR_COUNTER_OFF
-BINLOG_CHECKSUM
-MASTER_VERIFY_CHECKSUM
 INNODB_FILE_FORMAT_MAX
-SLAVE_SQL_VERIFY_CHECKSUM
 INNODB_MONITOR_COUNTER_RESET
 INNODB_MONITOR_COUNTER_RESET_ALL
 INNODB_MONITOR_COUNTER_ON
 INNODB_MONITOR_COUNTER_OFF
-BINLOG_CHECKSUM
-MASTER_VERIFY_CHECKSUM
 INNODB_FILE_FORMAT_MAX
-SLAVE_SQL_VERIFY_CHECKSUM
 drop table t1;
 drop table t2;

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-10-25 19:02:24 +0000
+++ b/sql/sys_vars.cc	2010-10-27 10:19:49 +0000
@@ -1897,6 +1897,10 @@ bool Sys_var_enum_binlog_checksum::globa
       mysql_bin_log.checksum_alg_reset= (uint8) var->save_result.ulonglong_value;
     mysql_bin_log.rotate_and_purge(flags);
   }
+  else
+  {
+    binlog_checksum_options= var->save_result.ulonglong_value;
+  }
   DBUG_ASSERT((ulong) binlog_checksum_options == var->save_result.ulonglong_value);
   DBUG_ASSERT(mysql_bin_log.checksum_alg_reset == BINLOG_CHECKSUM_ALG_UNDEF);
   mysql_mutex_unlock(mysql_bin_log.get_log_lock());


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