From: Andrei Elkin Date: October 26 2010 4:06pm Subject: bzr commit into mysql-next-mr branch (andrei.elkin:3184) WL#2540 List-Archive: http://lists.mysql.com/commits/121948 Message-Id: <201010261606.o9QG6sv1025355@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1484221300==" --===============1484221300== 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 3184 Andrei Elkin 2010-10-26 wl#2540 fixing error constants shifted after next-mr -> wl2540 merge. Meaningful changes are only to rpl_checksum_cache where sync_master was corrected to be played on the right connection modified: mysql-test/r/explain.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/t/rpl_checksum_cache.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result === modified file 'mysql-test/r/explain.result' --- a/mysql-test/r/explain.result 2010-09-23 09:10:02 +0000 +++ b/mysql-test/r/explain.result 2010-10-26 16:06:43 +0000 @@ -347,8 +347,8 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 index PRIMARY PRIMARY 1 NULL 5 100.00 Using where; Using index Warnings: -Warning 1708 Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url' -Warning 1708 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1711 Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1711 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' Note 1003 select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.`url` = 1) # Test that index can't be used for lookup due to collation mismatch @@ -359,8 +359,8 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 index PRIMARY PRIMARY 1 NULL 5 100.00 Using where; Using index Warnings: -Warning 1708 Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url' -Warning 1708 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1711 Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1711 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' Note 1003 select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.`url` = (('1' collate latin1_german2_ci))) # Normally, range access on primary key is done @@ -380,7 +380,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 index PRIMARY PRIMARY 1 NULL 5 100.00 Using where; Using index Warnings: -Warning 1708 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1711 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' Note 1003 select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.`url` > 3) # Test that range access on index can't be done due to collation mismatch @@ -392,7 +392,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 index PRIMARY PRIMARY 1 NULL 5 100.00 Using where; Using index Warnings: -Warning 1708 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1711 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' Note 1003 select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.`url` > (('3' collate latin1_german2_ci))) DROP TABLE t1; === modified file 'mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result' --- a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result 2010-09-17 11:32:06 +0000 +++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result 2010-10-26 16:06:43 +0000 @@ -132,7 +132,7 @@ Variable_name Value binlog_cache_size 4096 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384; Warnings: -Warning 1709 Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1712 Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size. SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE'; Variable_name Value max_binlog_cache_size 8192 @@ -141,7 +141,7 @@ Variable_name Value binlog_cache_size 8192 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096; Warnings: -Warning 1709 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1712 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE'; Variable_name Value max_binlog_cache_size 4096 === modified file 'mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result' --- a/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result 2010-09-17 11:32:06 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result 2010-10-26 16:06:43 +0000 @@ -135,7 +135,7 @@ Variable_name Value binlog_cache_size 4096 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384; Warnings: -Warning 1709 Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1712 Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size. SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE'; Variable_name Value max_binlog_cache_size 8192 @@ -144,7 +144,7 @@ Variable_name Value binlog_cache_size 8192 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096; Warnings: -Warning 1709 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1712 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE'; Variable_name Value max_binlog_cache_size 4096 === modified file 'mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result' --- a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result 2010-09-17 11:32:06 +0000 +++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result 2010-10-26 16:06:43 +0000 @@ -132,7 +132,7 @@ Variable_name Value binlog_cache_size 4096 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384; Warnings: -Warning 1709 Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1712 Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size. SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE'; Variable_name Value max_binlog_cache_size 8192 @@ -141,7 +141,7 @@ Variable_name Value binlog_cache_size 8192 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096; Warnings: -Warning 1709 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1712 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE'; Variable_name Value max_binlog_cache_size 4096 === modified file 'mysql-test/suite/rpl/t/rpl_checksum_cache.test' --- a/mysql-test/suite/rpl/t/rpl_checksum_cache.test 2010-10-25 19:13:06 +0000 +++ b/mysql-test/suite/rpl/t/rpl_checksum_cache.test 2010-10-26 16:06:43 +0000 @@ -68,7 +68,7 @@ end| delimiter ;| -let $1 = 4000; # be careful with a big value, PB2 can run it slow to time out on following sync_slave_with_master:s +let $1 = 4000; # PB2 can run it slow to time out on following sync_slave_with_master:s begin; --disable_warnings @@ -89,6 +89,7 @@ let $diff_table_2=slave:test.t1; source include/diff_tables.inc; # undoing changes with verifying the above once again +connection master; begin; delete from t1; @@ -131,6 +132,7 @@ let $diff_table_2=slave:test.t2; source include/diff_tables.inc; # undoing changes with verifying the above once again +connection master; begin; delete from t2; @@ -173,6 +175,7 @@ let $diff_table_2=slave:test.t3; source include/diff_tables.inc; # undoing changes with verifying the above once again +connection master; begin; delete from t3; === modified file 'mysql-test/suite/sys_vars/r/all_vars.result' --- a/mysql-test/suite/sys_vars/r/all_vars.result 2010-10-25 19:02:24 +0000 +++ b/mysql-test/suite/sys_vars/r/all_vars.result 2010-10-26 16:06:43 +0000 @@ -11,20 +11,20 @@ select variable_name as `There should be left join t1 on variable_name=test_name where test_name is null; There should be *no* variables listed below: INNODB_MONITOR_COUNTER_RESET -SLAVE_SQL_VERIFY_CHECKSUM INNODB_MONITOR_COUNTER_RESET_ALL INNODB_MONITOR_COUNTER_ON INNODB_MONITOR_COUNTER_OFF BINLOG_CHECKSUM MASTER_VERIFY_CHECKSUM INNODB_FILE_FORMAT_MAX -INNODB_MONITOR_COUNTER_RESET 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 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result' --- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result 2010-09-20 12:12:36 +0000 +++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result 2010-10-26 16:06:43 +0000 @@ -10,7 +10,7 @@ SELECT @start_binlog_cache_size; SET @@global.max_binlog_cache_size = 5000; Warnings: Warning 1292 Truncated incorrect max_binlog_cache_size value: '5000' -Warning 1709 Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1712 Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. SET @@global.max_binlog_cache_size = DEFAULT; SELECT @@global.max_binlog_cache_size; @@global.max_binlog_cache_size --===============1484221300== 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: 22caccce616f3a3f60dcab2727c971ffdc6d27c6 # timestamp: 2010-10-26 19:06:54 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\ # next-rm-wl2540-checksum/ # base_revision_id: andrei.elkin@stripped\ # inzgxzvc1x52o5o5 # # Begin bundle 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 TlpVMONACMQjRYD/Y/+LuSKcKEg7nhBBgA== --===============1484221300==--