From: Jorgen Loland Date: February 22 2011 8:02am Subject: bzr push into mysql-trunk branch (jorgen.loland:3695 to 3696) Bug#11762751 Bug#11764529 List-Archive: http://lists.mysql.com/commits/131837 X-Bug: 11762751,11764529 Message-Id: <20110222080209.472EE7A3@atum21.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3696 Jorgen Loland 2011-02-22 BUG#11762751: UPDATE STATEMENT THROWS AN ERROR, BUT STILL UPDATES THE TABLE ENTRIES (formerly 55385) BUG#11764529: MULTI UPDATE+INNODB REPORTS ER_KEY_NOT_FOUND IF A TABLE IS UPDATED TWICE (formerly 57373) Post-push fix: Error message introduced in 5.5 increased number of some error messages by 1 in trunk. @ mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result Error message introduced in 5.5 increased number of some error messages by 1 in trunk. @ mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result Error message introduced in 5.5 increased number of some error messages by 1 in trunk. @ mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result Error message introduced in 5.5 increased number of some error messages by 1 in trunk. @ mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result Error message introduced in 5.5 increased number of some error messages by 1 in trunk. 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_stmt_cache_size_basic.result 3695 Tatiana Azundris Nurnberg 2011-02-22 post merge cross platform fixes modified: mysql-test/include/mysqld--help.inc mysql-test/r/log_tables.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/t/log_tables.test === 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-12-19 17:22:30 +0000 +++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result 2011-02-22 08:01:58 +0000 @@ -8,7 +8,7 @@ Warning 1712 Option binlog_cache_size (3 SET GLOBAL binlog_cache_size = 4096; SET GLOBAL max_binlog_stmt_cache_size = 4096; Warnings: -Warning 1725 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. +Warning 1726 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. SET GLOBAL binlog_stmt_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 @@ Warning 1712 Option binlog_cache_size (3 SET GLOBAL binlog_cache_size = 4096; SET GLOBAL max_binlog_stmt_cache_size = 4096; Warnings: -Warning 1725 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. +Warning 1726 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. SET GLOBAL binlog_stmt_cache_size = 4096; include/stop_slave.inc include/start_slave.inc === 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-12-19 17:22:30 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result 2011-02-22 08:01:58 +0000 @@ -8,7 +8,7 @@ Warning 1712 Option binlog_cache_size (3 SET GLOBAL binlog_cache_size = 4096; SET GLOBAL max_binlog_stmt_cache_size = 4096; Warnings: -Warning 1725 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. +Warning 1726 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. SET GLOBAL binlog_stmt_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; @@ -134,7 +134,7 @@ Warning 1712 Option binlog_cache_size (3 SET GLOBAL binlog_cache_size = 4096; SET GLOBAL max_binlog_stmt_cache_size = 4096; Warnings: -Warning 1725 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. +Warning 1726 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. SET GLOBAL binlog_stmt_cache_size = 4096; include/stop_slave.inc include/start_slave.inc === 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-12-19 17:22:30 +0000 +++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result 2011-02-22 08:01:58 +0000 @@ -8,7 +8,7 @@ Warning 1712 Option binlog_cache_size (3 SET GLOBAL binlog_cache_size = 4096; SET GLOBAL max_binlog_stmt_cache_size = 4096; Warnings: -Warning 1725 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. +Warning 1726 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. SET GLOBAL binlog_stmt_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 @@ Warning 1712 Option binlog_cache_size (3 SET GLOBAL binlog_cache_size = 4096; SET GLOBAL max_binlog_stmt_cache_size = 4096; Warnings: -Warning 1725 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. +Warning 1726 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. SET GLOBAL binlog_stmt_cache_size = 4096; include/stop_slave.inc include/start_slave.inc === modified file 'mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result' --- a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result 2010-12-05 22:51:49 +0000 +++ b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result 2011-02-22 08:01:58 +0000 @@ -10,7 +10,7 @@ SELECT @start_binlog_stmt_cache_size; SET @@global.max_binlog_stmt_cache_size = 5000; Warnings: Warning 1292 Truncated incorrect max_binlog_stmt_cache_size value: '5000' -Warning 1725 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. +Warning 1726 Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size. SET @@global.max_binlog_stmt_cache_size = DEFAULT; SELECT @@global.max_binlog_stmt_cache_size; @@global.max_binlog_stmt_cache_size No bundle (reason: useless for push emails).