From: Martin Hansson
Date: September 7 2010 8:01am
Subject: bzr commit into mysql-5.5-merge branch (martin.hansson:3194) Bug#54543
List-Archive: http://lists.mysql.com/commits/117673
X-Bug: 54543
Message-Id: <20100907080105.3FD0A13FAC6@scott>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3788890573684386343=="

--===============3788890573684386343==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///data0/martin/bzr/bug54543/5.5m/ based on revid:dmitry.shulga@stripped

 3194 Martin Hansson	2010-09-07 [merge]
      Merge of fix for Bug#54543. Test case only (bug is not present in this tree).

    modified:
      mysql-test/r/multi_update.result
      mysql-test/t/multi_update.test
=== modified file 'mysql-test/r/multi_update.result'
--- a/mysql-test/r/multi_update.result	2010-05-26 14:34:25 +0000
+++ b/mysql-test/r/multi_update.result	2010-09-07 08:00:52 +0000
@@ -649,4 +649,24 @@ SET SESSION sql_safe_updates = 1;
 UPDATE IGNORE t1, t1 t1a SET t1.a = 1 WHERE t1a.a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 DROP TABLE t1;
+#
+# Bug#54543: update ignore with incorrect subquery leads to assertion
+# failure: inited==INDEX
+#
+SET SESSION sql_safe_updates = 0;
+CREATE TABLE t1 ( a INT );
+INSERT INTO t1 VALUES (1), (2);
+CREATE TABLE t2 ( a INT );
+INSERT INTO t2 VALUES (1), (2);
+CREATE TABLE t3 ( a INT );
+INSERT INTO t3 VALUES (1), (2);
+# Should not crash
+UPDATE IGNORE
+( SELECT ( SELECT COUNT(*) FROM t1 GROUP BY a, @v ) a FROM t2 ) x, t3
+SET t3.a = 0;
+Warnings:
+Error	1242	Subquery returns more than 1 row
+Error	1242	Subquery returns more than 1 row
+DROP TABLE t1, t2, t3;
+SET SESSION sql_safe_updates = DEFAULT;
 end of tests

=== modified file 'mysql-test/t/multi_update.test'
--- a/mysql-test/t/multi_update.test	2010-08-06 11:29:37 +0000
+++ b/mysql-test/t/multi_update.test	2010-09-07 08:00:52 +0000
@@ -650,5 +650,26 @@ SET SESSION sql_safe_updates = 1;
 UPDATE IGNORE t1, t1 t1a SET t1.a = 1 WHERE t1a.a = 1;
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#54543: update ignore with incorrect subquery leads to assertion
+--echo # failure: inited==INDEX
+--echo #
+SET SESSION sql_safe_updates = 0;
+CREATE TABLE t1 ( a INT );
+INSERT INTO t1 VALUES (1), (2);
+
+CREATE TABLE t2 ( a INT );
+INSERT INTO t2 VALUES (1), (2);
+
+CREATE TABLE t3 ( a INT );
+INSERT INTO t3 VALUES (1), (2);
+
+--echo # Should not crash
+UPDATE IGNORE
+  ( SELECT ( SELECT COUNT(*) FROM t1 GROUP BY a, @v ) a FROM t2 ) x, t3
+SET t3.a = 0;
+
+DROP TABLE t1, t2, t3;
+SET SESSION sql_safe_updates = DEFAULT;
 
 --echo end of tests


--===============3788890573684386343==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.hansson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@stripped\
#   4qdoj710nm0ejf1v
# target_branch: file:///data0/martin/bzr/bug54543/5.5m/
# testament_sha1: 53d29a9f25798aeeff914dce2351c39b9055f13f
# timestamp: 2010-09-07 10:01:05 +0200
# source_branch: file:///data0/martin/bzr/bug54543/5.1bt-commit/
# base_revision_id: dmitry.shulga@stripped\
#   x8xo4ckcj9kgzzqn
# 
# Begin bundle
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
EhF5gA==


--===============3788890573684386343==--