From: Andrei Elkin Date: October 28 2010 10:47am Subject: bzr push into mysql-next-mr branch (andrei.elkin:3187 to 3188) Bug#57589 List-Archive: http://lists.mysql.com/commits/122192 X-Bug: 57589 Message-Id: <201010281047.o9SAlEF2000388@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0227125210==" --===============0227125210== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3188 Andrei Elkin 2010-10-28 Bug #57589 error numbers shifted, rpl_checksum simulates OS and its error text is updated modified: mysql-test/r/explain.result mysql-test/suite/rpl/r/rpl_checksum.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/sys_vars/r/max_binlog_cache_size_basic.result 3187 Andrei Elkin 2010-10-27 [merge] merge wl2540 repo to a local tree added: mysql-test/suite/rpl/extension/README.checksum mysql-test/suite/rpl/extension/checksum.pl modified: mysql-test/collections/mysql-next-mr.push === modified file 'mysql-test/r/explain.result' --- a/mysql-test/r/explain.result 2010-10-26 16:06:43 +0000 +++ b/mysql-test/r/explain.result 2010-10-28 10:45:52 +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 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' +Warning 1710 Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1710 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 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' +Warning 1710 Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1710 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 1711 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1710 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 1711 Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1710 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_checksum.result' --- a/mysql-test/suite/rpl/r/rpl_checksum.result 2010-09-28 15:42:48 +0000 +++ b/mysql-test/suite/rpl/r/rpl_checksum.result 2010-10-28 10:45:52 +0000 @@ -64,7 +64,7 @@ set @@global.binlog_checksum = CRC32; insert into t1 values (1) /* will not be applied on slave due to simulation */; set @@global.debug='d,simulate_slave_unaware_checksum'; start slave; -*** Got IO thread error code: 1710, text: Slave can not handle replication events with the checksum that master is configured to log. *** +*** Got IO thread error code: 1236, text: Got fatal error 1236 from master when reading data from binary log: 'Slave can not handle replication events with the checksum that master is configured to log' *** select count(*) as zero from t1; zero 0 === 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-10-26 16:06:43 +0000 +++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result 2010-10-28 10:45:52 +0000 @@ -132,7 +132,7 @@ Variable_name Value binlog_cache_size 4096 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384; Warnings: -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. +Warning 1711 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 1712 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1711 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-10-26 16:06:43 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result 2010-10-28 10:45:52 +0000 @@ -135,7 +135,7 @@ Variable_name Value binlog_cache_size 4096 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384; Warnings: -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. +Warning 1711 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 1712 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1711 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-10-26 16:06:43 +0000 +++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result 2010-10-28 10:45:52 +0000 @@ -132,7 +132,7 @@ Variable_name Value binlog_cache_size 4096 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384; Warnings: -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. +Warning 1711 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 1712 Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1711 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/sys_vars/r/max_binlog_cache_size_basic.result' --- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result 2010-10-26 16:06:43 +0000 +++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result 2010-10-28 10:45:52 +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 1712 Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size. +Warning 1711 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 --===============0227125210== 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: 199da8d68c8515ab29e75e77fe66d80acc78ba79 # timestamp: 2010-10-28 13:47:14 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\ # next-rm-wl2540-checksum/ # base_revision_id: andrei.elkin@stripped\ # hjl2e908v82moxfa # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaQDnwQABU/fgAAwWPf//3qi 2KC////wYAl99Pg2gAABZbIpSSFNGmzAc0xMBGmBGEYAAAAmEYHNMTARpgRhGAAAAJhGBzTEwEaY EYRgAAACYRgJNUKYqPynlTTTzVGEaDTJoNDQAAAikRME0Tamp4E0yNJtU8p7UjT1NG0TaI2oJIgj QACJhAjTRT0g8kA00HqHshMyaSIa7ePfUmQUhp89u7XH6V6jK7iuA4sNLTXriVDjJbJAUDRmvo1r ErqoEa7VKqulH1/Au/3J1kmenCTrJkRURFBYC/X4wD82vHR/GVK2pohqJwJuHdfUcSt+zB2KmCVd qVpSl1JESLKZX2bceT79Ieh8vWxda0mdaqBo0jSvrrxYroGkfX8/bXUtVdY4+C0UcbJ5aloXrGVc DYN4zoGQUQyXx5rirqopBks/X0vwW0cY23jZLf78Ig5ceO/hO0dD3Ri48htwgss+KlMKPlnHh9hm C8jBrbZMPeFPjfRgGn2NgzNyDjOXUVBBImXgEjg6r1p1IA+CN/KpFnW83WSXXGkEC+iBd8oLVxjU lMbE4ychM+5MmuEJmwBRRZRsZnSb58iZyJoHuLV0ikKICehqQkMCUBol5MIADqJBg5kkciBUp1QU 1AHSmYhBkRZVzVgXmUysoWF4BAhXZZ7hBL7aIB2MGaoi2go+0EhfXAHAUcADw2NnolKcZQgMbOUb K+rMxaqtGym46YP5so8AQFBL2vwW+eI5cB91I+yFQ+2JdoceU7xXhcamYHUNg8jg3Q4bYA4c4ko+ Z/01CvIv63MKSAj2EggHHf4c61tYdE8CMR8e/eBA5o8Juq5QMyIBhC08jrBBwjZMdGD/mKpgvUOK 8xRsMx5GZJDGRmnWYPoQqKLzsPEgg8BgrOFAyOCZKbEh4DDlS4iQLDyPQzr5nmtNmx2fHUoEJ7Xq SrDYLgN52l4VxqJi1Ro4VCRpOBa4+MTdjXlVUol9ZglkGont6jkaqGRs40XRFUXSQc5Gtzn1DEA5 cD2ZNbWbq4Au1AkiZcYfxvc0JH5mCDErLRwj6pLwGrLDLJT3C0LTYhqQcwucUKwijmTMSZVXFFRU bVxoWElNEc/CrHIIjzN9wLsj2WOAwdsTqYQtKz5hcFOet5cbl6FsuRct6aBd1tau/EuhIrNC1jYy Li5gIA4WBKGuvMMy3S9uFePtkOSbJyA6zHQHcVPgqFZQdZZBeF87S+5iRtcQqiWQ2ptYisuOn4of NH0APA3WdLsHIOoi7hiOEpiH9HIT1Zsi8yDtQiMDGZUxUckYGwbHBaZVFuBIkFQeRM/brvdjai1m qQOatn4SaeDpSHAa5tJhAuvfbJw+iTLe7IwTyk4KFaKCsScvwHdiEfUe2q0YWIj/J/sNF7+Bj7rF C/MfwPqPzncjWNnigdo9Ob2oHgKwxSHTVpgISBKELQr6/fXYFiMAEjSkO8WJPMchzHQcxz+oxOeI 5IqP3zrme4dxQAR9PugVkwtHKzcb0sNq0Fhnb3P7LQH93uoadC5rcJ5AO85LAy++IP9HVkVxgH5R jZvcccNUbF00QOHNOqYUCPNPjQq50CyB6B52H8AbW8Tkgr/99g69Bz11v0gWd6DAwMmTJMgNg4Cz IPM+aBfD1mSD2DfYYvCOts+ZucBoMQCgbE9AEa49D8w5hmUF0LeLxkVn8gHXdWAl98Mp1m1JoNK/ URzyXOGB9Owqq7m4bRGZ27SXZ0TJobOwKARDxKAQ6EJoVWXrgHL4kAfX9JFTWi5VJQnoAec0hXUu F4C6A/r3zX3DeOgZdY0jSs0GGBzGkNGGzfqcyskx+jZQOpIXCjywF7CxvF9WeNoqkEgzEB8TM7wY DB0doT7ny/KGRybjdistYQvJ9MGx/DnAbO5BwtXeEIcF6EMumXXvpO2M1g9lWTWO6aReJatlbNC8 f05FemBawszljrPeXAHQdRRfI8DmeJoeoMU8Vthqcz0Aw5JTFx+QugoC9oue/yHPcrjJCtYCIhE3 DnsIuKJaAFnZ4jdhZrTBMBMcJ8KcG56qrjMoZ1GZkr5Srs8EY0DVuXjNQmWZvHIwI7YQmOXGjUtt TUAn02+6uoW5XxS5DOhtDRPjlPqS6zuC0BNf18qjnrdh16Qh1zCxR6kOfAMSYgDqA3jkOk4Bx6rV Bf1CydQMv2AjpMX42ThIWAfEVMkCcbkgbafpUI8O8fcGTedACSEzpl77mspIQYeSSy2Gl8+cxY2o V2D35zupu5nY1VLwsLJ/mhKmBCXAJNWsfECShCOZOgArcMkfkoNNcUCkwhngj0Go1hSAkjQVDdMb xKYQnJtHAPLVqF2B47+jmbhEmMyFG4XGDCv7zWgKBg1INqFz2Sa09jBc2lLNL5Ee6VACJfcYB3gJ gPHEKJfUV9EB1XSfIK6N6Lm/TMu0LFxgRG6JAd3cGaJtAgcekM5dL4rlkeAjjVl5iYeE1oAMZfWN 7Qjs2FOnWEvI6dqrk0SwJkExMUpy5MndJjSvUDbeuvhoLPBL3BxdWxFHBsBYIIgIvA3yRm3klihW FVqBggI7IhuSzXk7i9hfIYPhLsANOAucAYCZEsAsoohYwlWmcWMUhJ3Z7ypdS0rvCEtrFhC9vAIu i2AJZlxDyXEaV8+0+VwS6ZK3ZC2eTP6DQPM3kOhMVjmgZMn9YQ7/gGKw7KR0G2doWiNDUyTKVKG4 A5FbUbCAg1p5m4dS0lgXZGaoTyf+LuSKcKEhSAc+CA== --===============0227125210==--