From: Andrei Elkin
Date: October 27 2010 10:20am
Subject: bzr commit into mysql-next-mr branch (andrei.elkin:3186) WL#2540
List-Archive: http://lists.mysql.com/commits/122063
Message-Id: <201010271020.o9RAK7oE004008@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0595784440=="

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

#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());


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl2540/
# testament_sha1: f3f37873f7530c2f83c0267b8c5ece98a2170aab
# timestamp: 2010-10-27 13:20:07 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\
#   next-rm-wl2540-checksum/
# base_revision_id: andrei.elkin@stripped\
#   gxq5989yoquex4uw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSTeTCoAAjJfgEAQWGP//3IA
BAC////6UAS5neoA7d56dPNuJ4SSTQpP0xMmmJiaYmoyNTJ6gaDBKKmamGpij09I2onlBkwGo2k9
TTJhkTQRNQ/QFPU/VGjR6gAAA9QSKJpNDE0yJtRmoNAMQABhKEEaaDRGIjGomT1NDIGhoFvnnqg8
5j7FuWWvD2ccjnDGl5cj5IpNGW163M9y3lQI4jrFoRERAfXxMofUFrXfQCyaxbBmFTpI5kr2wTA/
fOeA594LoerhVQW+/7YwJ8OExXlqJ3wuq9iytoQKIYZNEgVNMhQgn5Gyg9VSmKUXHna99oDW1lUP
o4axCo1IUlVoMVlVBGmQr2Ba4IvLmQQpkKI2oGCoIrI3T1HUHwMuCg4gTCTkYejNnPE+ReKhkCgo
WyCFwwAghR1SLzPG5VnqyaWbGXGSmNsG0wsJ7BvGM/1flVWYuLS570ax3hmMc6mtKAWGAtl9RIYD
PlY+oi7UQPBnmo1q52yvG7CPnpXyWKQBRQNXTLZxbQid2j0OV528ls757ihUU00hsLCMTQsxwnaM
eO8Z283KUdT2KAaEbrq7A8BmMhTuYiOprGZxxA76h6VY1l8tQPan9TUCeD3DC1uvHzOBm5L8Qwdx
0R26iPyQzkfzmYbjGLnXKqJSVrwm8wvDrOvUQqcV2Ks1AWebrZRRRfTi2nW42hWZ5ZA+vAGsuVSv
Umw5d5A41HuOpUZKmGgpWXJpKj8YWlw1spH+LSOHxdhIvAncVAwowhWP4XECIkbtXCYZTZVEuDEb
HWWPSE1LwoCQRjIiEUGzDgtu+YyPT4ji1Hw+Tk78QlhPlbY2/2FS3Qnqg2jcS4qPlgRKQPSRglJE
pZrJrpkEji8mwoR3OcttjimOUIyNMO/nhmwT7UnBYuNdNlmkJyyLoeTc4B5FnAR+9WQh6vN4xEfY
DhH4+LFExQeah3gSe02WfxA7VyFIRL3XKpumX+RJZhAFchEsLzokBEh87NvDom3i6BJXYeZcUAeh
DF3hIwLBu2HodD1i2uHSEaKZKTZFaUY0+W5j1rErn/TRqfdxjsQu1ciqTBPa+rDlOByvnbxhOZII
tNackTy6ajqt1TGnW1GNas3mjaMd1kTUdlq68Wrp+0C5mmY7iKX4mfhsoC2BhJjEfL0Qz8FQk4l1
Zkgk6VX/66mKpEmOSNNNsR1NxafcieksSGp7mgC1EQcAh6tDEgoJoMuj2kCcGN23RXuCgWPDaEHk
R+4vFN4Y5x0hAx4tzv6syHagUEo8ScR/wQpthjkRHB5S6mWcUmDVeaVt6SkjNEhMU4KlCuRIurlH
NR7T49wLLWGB6jz2XPhhwwUijeueC7rLsRiAgdWd5CIyJ6Jxv78kqfJKenB9JhVUEOQdCTue/6Vo
Fe1PXRjmtDogpaGkY3EztVpINmoebn3FcTfiPTLk2xB48JkcXNSQkl2lv1wOD5IXAsGCW4qrmyXh
ni4WWvVU8d8TOFSUJrReSGGOBgBiBUnyHB8a3WSUJ4syLgpv2fpS1jFYF5LdOrZ+J+B54F3JFOFC
QJN5MKg=


--===============0595784440==--