From: Jorgen Loland Date: February 22 2011 8:02am Subject: bzr commit into mysql-trunk branch (jorgen.loland:3696) Bug#11762751 Bug#11764529 List-Archive: http://lists.mysql.com/commits/131836 X-Bug: 11762751,11764529 Message-Id: <20110222080201.D4A387A3@atum21.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4281572274586149573==" --===============4281572274586149573== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/jl208045/mysql/mysql-trunk-55385/ based on revid:azundris@stripped 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 === 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 --===============4281572274586149573== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jorgen.loland@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@stripped\ # yssmiplzhyanbdiy # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-55385/ # testament_sha1: c442d4bc397dcebe9abedcd776220bee02bd135a # timestamp: 2011-02-22 09:02:01 +0100 # source_branch: file:///export/home/jl208045/mysql/mysql-5.5/ # base_revision_id: azundris@stripped # # Begin bundle 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 pf/F3JFOFCQE8JiuQA== --===============4281572274586149573==--