#At file:///export/home/didrik/repo/next-mr-bugfixing/ based on revid:vasil.dimov@stripped
3344 Tor Didriksen 2010-10-29
Post-merge fix: new error numbers.
modified:
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
sql/share/errmsg-utf8.txt
=== 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-27 14:46:44 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result 2010-10-29 09:43:58 +0000
@@ -8,7 +8,7 @@ call mtr.add_suppression("Unsafe stateme
call mtr.add_suppression("Option binlog_cache_size ");
SET GLOBAL max_binlog_cache_size = 4096;
Warnings:
-Warning 1713 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 binlog_cache_size = 4096;
CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb;
CREATE TABLE t2(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=MyIsam;
@@ -132,7 +132,7 @@ source include/diff_master_slave.inc;
# [ On Slave ]
SET GLOBAL max_binlog_cache_size = 4096;
Warnings:
-Warning 1713 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 binlog_cache_size = 4096;
include/stop_slave.inc
include/start_slave.inc
@@ -161,7 +161,7 @@ count(*)
########################################################################################
SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 8192;
Warnings:
-Warning 1713 Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning 1712 Option binlog_cache_size (32768) 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
@@ -170,7 +170,7 @@ Variable_name Value
binlog_cache_size 8192
SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384;
Warnings:
-Warning 1714 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
@@ -179,7 +179,7 @@ Variable_name Value
binlog_cache_size 8192
SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096;
Warnings:
-Warning 1714 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-10-27 14:46:44 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result 2010-10-29 09:43:58 +0000
@@ -8,7 +8,7 @@ call mtr.add_suppression("Unsafe stateme
call mtr.add_suppression("Option binlog_cache_size ");
SET GLOBAL max_binlog_cache_size = 4096;
Warnings:
-Warning 1713 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 binlog_cache_size = 4096;
CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb;
CREATE TABLE t2(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=MyIsam;
@@ -133,7 +133,7 @@ source include/diff_master_slave.inc;
# [ On Slave ]
SET GLOBAL max_binlog_cache_size = 4096;
Warnings:
-Warning 1713 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 binlog_cache_size = 4096;
include/stop_slave.inc
include/start_slave.inc
@@ -162,7 +162,7 @@ count(*)
########################################################################################
SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 8192;
Warnings:
-Warning 1713 Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning 1712 Option binlog_cache_size (32768) 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
@@ -171,7 +171,7 @@ Variable_name Value
binlog_cache_size 8192
SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384;
Warnings:
-Warning 1714 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
@@ -180,7 +180,7 @@ Variable_name Value
binlog_cache_size 8192
SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096;
Warnings:
-Warning 1714 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-10-27 14:46:44 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result 2010-10-29 09:43:58 +0000
@@ -8,7 +8,7 @@ call mtr.add_suppression("Unsafe stateme
call mtr.add_suppression("Option binlog_cache_size ");
SET GLOBAL max_binlog_cache_size = 4096;
Warnings:
-Warning 1713 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 binlog_cache_size = 4096;
CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb;
CREATE TABLE t2(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=MyIsam;
@@ -132,7 +132,7 @@ source include/diff_master_slave.inc;
# [ On Slave ]
SET GLOBAL max_binlog_cache_size = 4096;
Warnings:
-Warning 1713 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 binlog_cache_size = 4096;
include/stop_slave.inc
include/start_slave.inc
@@ -161,7 +161,7 @@ count(*)
########################################################################################
SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 8192;
Warnings:
-Warning 1713 Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning 1712 Option binlog_cache_size (32768) 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
@@ -170,7 +170,7 @@ Variable_name Value
binlog_cache_size 8192
SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384;
Warnings:
-Warning 1714 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
@@ -179,7 +179,7 @@ Variable_name Value
binlog_cache_size 8192
SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096;
Warnings:
-Warning 1714 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/sys_vars/r/max_binlog_cache_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result 2010-10-27 14:46:44 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result 2010-10-29 09:43:58 +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 1714 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
=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt 2010-10-27 14:46:44 +0000
+++ b/sql/share/errmsg-utf8.txt 2010-10-29 09:43:58 +0000
@@ -6420,10 +6420,10 @@ ER_TABLES_DIFFERENT_METADATA
ER_ROW_DOES_NOT_MATCH_PARTITION
eng "Found row that does not match the partition"
swe "Hittade rad som inte passar i partitionen"
-ER_WARN_INDEX_NOT_APPLICABLE
- eng "Cannot use %-.64s access on index '%-.64s' due to type or collation conversion on field '%-.64s'"
ER_BINLOG_CACHE_SIZE_GREATER_THAN_MAX
eng "Option binlog_cache_size (%lu) is greater than max_binlog_cache_size (%lu); setting binlog_cache_size equal to max_binlog_cache_size."
+ER_WARN_INDEX_NOT_APPLICABLE
+ eng "Cannot use %-.64s access on index '%-.64s' due to type or collation conversion on field '%-.64s'"
ER_TRUNCATE_ILLEGAL_FK 42000
eng "Cannot truncate a table referenced in a foreign key constraint (%.192s)"
Attachment: [text/bzr-bundle] bzr/tor.didriksen@oracle.com-20101029094358-1eti7a7ab4rewizh.bundle
| Thread |
|---|
| • bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3344) | Tor Didriksen | 29 Oct |
