From: Ole John Aske
Date: February 2 2011 8:15am
Subject: bzr commit into mysql-trunk branch (ole.john.aske:3587) Bug#58490
List-Archive: http://lists.mysql.com/commits/130181
X-Bug: 58490
Message-Id: <20110202081522.59D9D223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7340883898248708869=="

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

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-trunk/ based on revid:magnus.blaudd@stripped

 3587 Ole John Aske	2011-02-02
      Fixed failing testcase after commit of fix for bug#58490.
      
      Added '--sorted_result' to new testcases to get deterministic order of result set.

    modified:
      mysql-test/r/join_outer.result
      mysql-test/t/join_outer.test
=== modified file 'mysql-test/r/join_outer.result'
--- a/mysql-test/r/join_outer.result	2011-02-01 14:24:57 +0000
+++ b/mysql-test/r/join_outer.result	2011-02-02 08:15:16 +0000
@@ -1621,9 +1621,9 @@ RIGHT JOIN h TABLE2 ON TABLE1.col_int_ke
 RIGHT JOIN m TABLE4 ON TABLE2.col_int_key=TABLE4.col_int_key;
 pk
 2
-4
 2
 4
+4
 NULL
 NULL
 NULL

=== modified file 'mysql-test/t/join_outer.test'
--- a/mysql-test/t/join_outer.test	2011-02-01 14:24:57 +0000
+++ b/mysql-test/t/join_outer.test	2011-02-02 08:15:16 +0000
@@ -1121,6 +1121,7 @@ INSERT INTO t3 VALUES (0),(1),(2),    (4
 CREATE TABLE t4 (i INT NOT NULL);
 INSERT INTO t4 VALUES (0),(1),(2),(3)   ;
 
+--sorted_result
 SELECT * FROM
  t1 LEFT JOIN
  ( t2 LEFT JOIN
@@ -1133,6 +1134,7 @@ SELECT * FROM
  ON t2.i = t1.i
  ;
 
+--sorted_result
 SELECT * FROM
  t1 LEFT JOIN
  ( t2 LEFT JOIN
@@ -1148,6 +1150,7 @@ SELECT * FROM
 
 # Most simplified testcase to reproduce the bug.
 # (Has to be at least a two level nested outer join)
+--sorted_result
 SELECT * FROM
  t1 LEFT JOIN
  ( ( t2 LEFT JOIN
@@ -1163,6 +1166,7 @@ SELECT * FROM
 # We then add some equi-join inside the query above:
 # (There Used to be some problems here with first
 #  proposed patch for this bug)
+--sorted_result
 SELECT * FROM
  t1 LEFT JOIN
  ( ( t2 LEFT JOIN
@@ -1175,6 +1179,7 @@ SELECT * FROM
  ON t2.i = t1.i
  WHERE t3.i IS NULL;
 
+--sorted_result
 SELECT * FROM
  t1 LEFT JOIN
  ( ( t2 LEFT JOIN
@@ -1187,6 +1192,7 @@ SELECT * FROM
  ON t2.i = t1.i
  WHERE t3.i IS NULL;
 
+--sorted_result
 SELECT * FROM
  t1 LEFT JOIN
  ( ( t2 LEFT JOIN
@@ -1218,11 +1224,13 @@ CREATE TABLE k (pk INT NOT NULL, col_int
 INSERT INTO k VALUES (1,9),(2,2),(3,5),(4,2),(5,7),(6,0),(7,5);
 
 # Baseline query wo/ 'WHERE ... IS NULL' - was correct
+--sorted_result
 SELECT TABLE1.pk FROM k TABLE1
 RIGHT JOIN h TABLE2 ON TABLE1.col_int_key=TABLE2.col_int_key
 RIGHT JOIN m TABLE4 ON TABLE2.col_int_key=TABLE4.col_int_key;
 
 # Adding 'WHERE ... IS NULL' -> incorrect result
+--sorted_result
 SELECT TABLE1.pk FROM k TABLE1
 RIGHT JOIN h TABLE2 ON TABLE1.col_int_key=TABLE2.col_int_key
 RIGHT JOIN m TABLE4 ON TABLE2.col_int_key=TABLE4.col_int_key


--===============7340883898248708869==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   fv7dqwj11afpumsi
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-trunk/
# testament_sha1: ce5cf5ea0f58b97d360152ac8e9c4ffd53167ec8
# timestamp: 2011-02-02 09:15:22 +0100
# source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.5/
# base_revision_id: magnus.blaudd@stripped\
#   zy98jul6okjlpudf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZzNu3QAAmHfgAAQWOP/93MQ
gAC////wUAUYntJdonBdZhbNcJKQ1MmBMaTJtTTJlT01HqZAbUNBKQmU80JqntUbJAA0AAAAkUBN
UwyT0aaJqPTU00Yg000aAwAAAAA0GgDQDQCSJNRiehTyaDQE0wp4poB6mj0uw17/UB7H5+R6+3Df
kC1aJYzkCk0tekjvmMuhCWdcIwj4VxPA4jbQNr06wW6VGa3rab6ns1O+KnOlZXu5kJUlSUJzj5aW
fo04RPr/PT+8abiF1tzkWal+OMQfnhtC2MltdiW4+ihYkUyaE+QFUQe6FzHgQsHwXBgfrHsg97h+
KvlZPOkYrBAoxOIp4i8iQaMRgyOFTwCQScQOEdIMhQAvGA4IgvgxlYyLgXW1z8ZoW4zwshVQ0NHB
qXwp+wOkxVCgdqYZrWMZEzeAcmZfhfEpEiLLQA8gy5EiKJjQx1Y2MFZocCozsDhPKm7egK0Ihiub
WMinGA3wcNRSacTGLYSqwjTCMET4HQsZ8ShqwuUHv9mY8ZbCtdajS4la0zKEalNprDbjq35HfPad
DnIqagtIaWWBQ5vvyqARGVhCgZUmeJcpMOankRisDRzsHvBFcbHamzMI0gFeRCqmfjl334JxMVO0
rXqNWLwbYGA3EgiZBq+OzSY2O+/aVvr1JppMvQhkWftJJuWk2Ck+hYses3ZP1BZ/6BsHjyr1DlAb
fEqaRNLS23KLPQk3HLMoVKTqLrRqWeEdQ2BEJu3s0mVJkjElfEWu61hXBpZWQYl2JBiTiDi5KqKV
fJY55FhnyL0cvM7Zkk0FrODabfrDsk7aCSUBQqg6eMUMWGBLlt6tn+zKnceLErYHCQCuJqHLf3tL
G5HWhKw2SJU1dGmvjQzY1hqTDFqPJ1jdmkncZrDWC/KfiVnMssIMCUzJj4jIx/CBjBJwla6kuGrJ
ZF97TCZxYUhXIDDAh4kaHKhBtXcvLdRzrty6JzwKPx69eTBrEhM55/XE07GJANkMiPsRnYoSHyGz
IN5IjDl4pkQba0zMn1N5q7DDub/MDtX0TC+zE8oc+UOcNHCSGy5CznaKL5opuM4cuW3eMrjSPrPa
es1prl4NpiWS11VyArGeR9wKZ86ZNFuyCrcZi9xokRN4KsC8E0cC/TB33fCGbmuVwqvmRGxZUK1F
Xyy88rm1IlLkWyHD+7ibyB3PapeyRtgMYP9TZZlZQCr79Ecl4bVMECPBbsuEewy/R7Lz1LhKtIcu
GXP1l4TIVpZ09ffIhUjLkuqkPMQ5ESMVE7SApJt5HpOyQwOLsUOiEHItPrN5gKZgsTrlbWW5DzmQ
G5XHg5ph++xC7DKtHORX5ErEWQV6DjMtO7oLdiFP6MMH7Jljc3vazgaKgD6FOlC56HcCnMhsgQXk
SQenUcQxpVA3eUGbe+S0E6qGEcpIJOTWUWKOjp11pq0vR8YqROUAWogfydI71F7GoyIOJxZm7r0Q
SsQ6E2w2gVTRgXsmPTCPbHAj7gwNxQU4Cuo2KRgJpnzS8CGsjGopVzLpIAt5DzChQLx0yXGhCaBN
BHzJLEWi4jgQV/PQi4ynfCZqAJGaid6zGixaiSUzTWTYSScrUT/F3JFOFCQnM27dAA==


--===============7340883898248708869==--