#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` = <cache>(('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` > <cache>(('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
Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20101026160643-ov98axm8iosd2atl.bundle
| Thread |
|---|
| • bzr commit into mysql-next-mr branch (andrei.elkin:3184) WL#2540 | Andrei Elkin | 26 Oct |
