From: Mattias Jonsson Date: October 6 2010 7:20am Subject: bzr push into mysql-next-mr-bugfixing branch (mattias.jonsson:3316 to 3317) List-Archive: http://lists.mysql.com/commits/120052 Message-Id: <201010060722.o965TfEa022066@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4504594076360449415==" --===============4504594076360449415== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3317 Mattias Jonsson 2010-10-06 post-push fix for changed error codes 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/sys_vars/r/max_binlog_cache_size_basic.result 3316 Mattias Jonsson 2010-10-05 [merge] merge modified: mysql-test/r/partition_exchange.result mysql-test/t/partition_exchange.test sql/share/errmsg-utf8.txt sql/sql_partition_admin.cc === modified file 'mysql-test/r/explain.result' --- a/mysql-test/r/explain.result 2010-10-04 13:10:35 +0000 +++ b/mysql-test/r/explain.result 2010-10-06 07:19:08 +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 1709 Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1709 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 1709 Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url' +Warning 1709 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 1709 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 1709 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-06 07:19:08 +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 1710 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 1710 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-06 07:19:08 +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 1710 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 1710 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-06 07:19:08 +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 1710 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 1710 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-09-20 12:12:36 +0000 +++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result 2010-10-06 07:19:08 +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 1710 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 --===============4504594076360449415== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mattias.jonsson@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@stripped\ # f9vrq50hfz098d9d # target_branch: file:///Users/mattiasj/mysql-bzr/topush-next-mr-\ # bugfixing/ # testament_sha1: a810d2846125051bdbcef4760c46ebcbf8489dad # timestamp: 2010-10-06 09:20:19 +0200 # source_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\ # bugfixing/ # base_revision_id: mattias.jonsson@stripped\ # z2nn0a2yiws0y4y0 # # Begin bundle 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 --===============4504594076360449415==--