From: Tor Didriksen
Date: September 30 2010 3:02pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3258) Bug#48291
List-Archive: http://lists.mysql.com/commits/119564
X-Bug: 48291
Message-Id: <20100930150203.D01E8372C@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7821012148810909040=="

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

#At file:///export/home/didrik/repo/next-mr-opt-backporting-merge-from-opt-team/ based on revid:tor.didriksen@stripped

 3258 Tor Didriksen	2010-09-30
      Removed a part of the test case for bug#48291 since it is not valid anymore.

    modified:
      mysql-test/r/select_all_jcl6.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_icp_mrr_jcl6.result
      mysql-test/r/select_none_jcl6.result
=== modified file 'mysql-test/r/select_all_jcl6.result'
--- a/mysql-test/r/select_all_jcl6.result	2010-09-09 18:21:34 +0000
+++ b/mysql-test/r/select_all_jcl6.result	2010-09-30 15:01:59 +0000
@@ -4435,11 +4435,6 @@ SELECT 1 FROM t1 WHERE a <> 1 AND NOT
 ROW(1,a) <=> ROW(1,(SELECT 1 FROM t1))
 INTO @var0;
 ERROR 21000: Subquery returns more than 1 row
-SELECT 1 FROM t1 WHERE a <> 1 AND NOT
-ROW(a,a) <=> ROW((SELECT 1 FROM t1 WHERE 1=2),(SELECT 1 FROM t1));
-1
-1
-1
 DROP TABLE t1;
 #
 # Bug #48458: simple query tries to allocate enormous amount of

=== modified file 'mysql-test/r/select_icp_mrr.result'
--- a/mysql-test/r/select_icp_mrr.result	2010-09-09 18:21:34 +0000
+++ b/mysql-test/r/select_icp_mrr.result	2010-09-30 15:01:59 +0000
@@ -4431,11 +4431,6 @@ SELECT 1 FROM t1 WHERE a <> 1 AND NOT
 ROW(1,a) <=> ROW(1,(SELECT 1 FROM t1))
 INTO @var0;
 ERROR 21000: Subquery returns more than 1 row
-SELECT 1 FROM t1 WHERE a <> 1 AND NOT
-ROW(a,a) <=> ROW((SELECT 1 FROM t1 WHERE 1=2),(SELECT 1 FROM t1));
-1
-1
-1
 DROP TABLE t1;
 #
 # Bug #48458: simple query tries to allocate enormous amount of

=== modified file 'mysql-test/r/select_icp_mrr_jcl6.result'
--- a/mysql-test/r/select_icp_mrr_jcl6.result	2010-09-09 18:21:34 +0000
+++ b/mysql-test/r/select_icp_mrr_jcl6.result	2010-09-30 15:01:59 +0000
@@ -4435,11 +4435,6 @@ SELECT 1 FROM t1 WHERE a <> 1 AND NOT
 ROW(1,a) <=> ROW(1,(SELECT 1 FROM t1))
 INTO @var0;
 ERROR 21000: Subquery returns more than 1 row
-SELECT 1 FROM t1 WHERE a <> 1 AND NOT
-ROW(a,a) <=> ROW((SELECT 1 FROM t1 WHERE 1=2),(SELECT 1 FROM t1));
-1
-1
-1
 DROP TABLE t1;
 #
 # Bug #48458: simple query tries to allocate enormous amount of

=== modified file 'mysql-test/r/select_none_jcl6.result'
--- a/mysql-test/r/select_none_jcl6.result	2010-09-09 18:21:34 +0000
+++ b/mysql-test/r/select_none_jcl6.result	2010-09-30 15:01:59 +0000
@@ -4434,11 +4434,6 @@ SELECT 1 FROM t1 WHERE a <> 1 AND NOT
 ROW(1,a) <=> ROW(1,(SELECT 1 FROM t1))
 INTO @var0;
 ERROR 21000: Subquery returns more than 1 row
-SELECT 1 FROM t1 WHERE a <> 1 AND NOT
-ROW(a,a) <=> ROW((SELECT 1 FROM t1 WHERE 1=2),(SELECT 1 FROM t1));
-1
-1
-1
 DROP TABLE t1;
 #
 # Bug #48458: simple query tries to allocate enormous amount of


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   6lg655ibaeicahj9
# target_branch: file:///export/home/didrik/repo/next-mr-opt-\
#   backporting-merge-from-opt-team/
# testament_sha1: 62b54c6f99c7a580aa2deb6d7261790afb848c22
# timestamp: 2010-09-30 17:02:03 +0200
# source_branch: file:///export/home/didrik/repo/next-mr-opt-team-\
#   merge-from-bf/
# base_revision_id: tor.didriksen@stripped\
#   b19rawxk2gqcrap0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdEs3+4AAyBfgAAQWGP/91YA
FAC////wUAX4eAAEgWwAapDSgIYNTIyZHoaT0jARppgMaGhoAMhoAAAAAJFCYjRE9TyTU2k9INME
2kepoGMaGhoAMhoAAAAAFSiAQZAJiJggCI09TR5MA6g5QMnqZwjdBSJO2tQM9NSKWdAthJz1jSW0
PoG4GDBhy8lOv6nUjCTMZw2ubMhhtobK25+A8vFHL/XSl0h7RpEPNo6JwA9J67NmdTpcw3BK4Ku1
u5KLSDl27/XnZwgsTmanEmkHAMQWipgZ97M6dTPrrydr+pcarnTbvLQuC5SUjiXGeq8tI8etfRVO
6khStISlbZJRUmxltf0pc5y5MFyqXlJJfJfFj9ljGxzP+r2Fa69R9ZdtGrK2el0J99Gpzdo9/FcX
Ft1l+C/21+3RvOS9/JqUvSmU0OW2xE2KNjLJ3TlJm9LzyvVwcTvKbym8uaHOx4P7ddMbVk2UhMth
ZN9jccGOinu7suFsnfbz5P7KLHzmTx0klrxLFWo2qMViqheUtWFdHArYwyLVkZ0cF+ikyblYZ31m
PIlk3sMWbUurSmjj+LWRRZHLeqVVOR5mrVRz15E683kc1W9cptw4EwnD4efSXa+lNWsnZ+zNtubG
TgxWdLyftkXnkasqU5zRwhVNu10Jdo6a9S9uXm/Y5zbcm8vVVX8sdGLcTW2XKpjKxPPXVsOax4Nv
S3cytWYbk0dmDVRcl+3ZcwUseupcW9uO9szs08bW1cx3atLb7Uo3N9Pkez4NJxNbhabqbCW1M+Rt
eKmGC0x6r8lskoZzhqo9THvcunJsanjprmmG0MnJ5uAWyc5wRnOInN3IqlSrqHmjfu2hgD3ttjYd
4Ph+A8ZAi8m22hnthHiWSgDC/ssda1tUk8krJ+PxUZb1iPRx8Feby+/d2vbfTcFG6hNe62T6P22E
p8v10NXPHnSccyau8+RdPlvdH0nFZ6s/f3VamFXEmi3wLmvUYXOh58bnk9Sdzee+HBY1sc5Xo3Zv
j85xJuweP7xeiy+ylPpCgfUjfan8zKJWnc6YOLpu5uDLJfYzTk1JX4rDCFXJ83FnYycA9ouPFkh+
dH1OPDj8/v3TBEdN5ANfkSZQNHpmUPIO8OiiPCGQdaaIubHhKDk+FDBoAq4ngkUI5FAcQIAL1CZS
T8qJgCiP1WD0jjKJ0PTyw3cjH3xcLr4pZJOFkLPbq1uCvr1PDst9l7tbGLq0j/x4n2PicKzr96eT
tdQvPQnWNB6yji8UVd9dSfA0LW3LsSpK5/wm3dWH66BZaysjCDwJY5fk30kzt//4cbb5MOElPTit
M/5Ox9icodfzKZFkmRZ5QYMTsa5Loa+hbaeystxLwoLCehPLepwpsk2GXY7Fj3iLJfHj4bXLMw/u
uF8Yc0/RUyvxSpUK9izGklhjVfjL8BbRPcrMfM0zw5yFaL5PWfS1sfvH2DeFJONk+qyZVON2kp5H
waJu50KJS6MOGXI7eZjUvcH+p7GY9lzdt7lgeE2zaVlkkd+E/iWZSP6Rv9ecayx6kBuC9fDrulmL
GtEcYFdaBGfr/GNjbZ2IG53obTdskqbE3epkUGyTGSgpszy8N3umfb2Q9Av4JXA0YBMBvS8M9LAw
G75Y7BtbnCKFfrskzL6Jv5er8nncf8MXlSTQ6L2/fjPmdpNroYNjmbmyVLj8zRkjhNn2PQf7NVkU
mHuLuSKcKEholm/3AA==


--===============7821012148810909040==--