From: Sergey Glukhov
Date: April 22 2011 7:20am
Subject: bzr commit into mysql-5.1 branch (sergey.glukhov:3668) Bug#11756928
List-Archive: http://lists.mysql.com/commits/135944
X-Bug: 11756928
Message-Id: <201104220720.p3M7KLIB008300@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2656675501413378922=="

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

#At file:///home/gluh/MySQL/mysql-5.1/ based on revid:jon.hauglid@stripped

 3668 Sergey Glukhov	2011-04-22
      Bug#11756928  48916: SERVER INCORRECTLY PROCESSING HAVING CLAUSES WITH AN ORDER BY CLAUSE
      Before sorting HAVING condition is split into two parts,
      first part is a table related condition and the rest of is
      HAVING part. Extraction of HAVING part does not take into account
      the fact that some of conditions might be non-const but
      have 'used_tables' == 0 (independent subqueries)
      and because of that these conditions are cut off by
      make_cond_for_table() function.
      The fix is to use (table_map) 0 instead of used_tables in
      third argument for make_cond_for_table() function.
      It allows to extract elements which belong to sorted
      table and in addition elements which are independend
      subqueries.
     @ mysql-test/r/having.result
        test case
     @ mysql-test/t/having.test
        test case
     @ sql/sql_select.cc
        The fix is to use (table_map) 0 instead of used_tables in
        third argument for make_cond_for_table() function.
        It allows to extract elements which belong to sorted
        table and in addition elements which are independend
        subqueries.

    modified:
      mysql-test/r/having.result
      mysql-test/t/having.test
      sql/sql_select.cc
=== modified file 'mysql-test/r/having.result'
--- a/mysql-test/r/having.result	2010-07-09 10:39:47 +0000
+++ b/mysql-test/r/having.result	2011-04-22 07:20:55 +0000
@@ -545,4 +545,26 @@ FROM t1 JOIN t2 ON t2.f2 LIKE 'x'
 HAVING field1 < 7;
 field1
 DROP TABLE t1,t2;
+#
+# Bug#48916 Server incorrectly processing HAVING clauses with an ORDER BY clause
+#
+CREATE TABLE t1 (f1 INT, f2 INT);
+INSERT INTO t1 VALUES (1, 0), (2, 1), (3, 2);
+CREATE TABLE t2 (f1 INT, f2 INT);
+SELECT t1.f1
+FROM t1
+HAVING (3, 2) IN (SELECT f1, f2 FROM t2) AND t1.f1  >= 0
+ORDER BY t1.f1;
+f1
+SELECT t1.f1
+FROM t1
+HAVING (3, 2) IN (SELECT 4, 2) AND t1.f1  >= 0
+ORDER BY t1.f1;
+f1
+SELECT t1.f1
+FROM t1
+HAVING 2 IN (SELECT f2 FROM t2) AND t1.f1  >= 0
+ORDER BY t1.f1;
+f1
+DROP TABLE t1,t2;
 End of 5.1 tests

=== modified file 'mysql-test/t/having.test'
--- a/mysql-test/t/having.test	2010-07-09 10:39:47 +0000
+++ b/mysql-test/t/having.test	2011-04-22 07:20:55 +0000
@@ -564,4 +564,30 @@ HAVING field1 < 7;
 
 DROP TABLE t1,t2;
 
+--echo #
+--echo # Bug#48916 Server incorrectly processing HAVING clauses with an ORDER BY clause
+--echo #
+
+CREATE TABLE t1 (f1 INT, f2 INT);
+INSERT INTO t1 VALUES (1, 0), (2, 1), (3, 2);
+CREATE TABLE t2 (f1 INT, f2 INT);
+
+SELECT t1.f1
+FROM t1
+HAVING (3, 2) IN (SELECT f1, f2 FROM t2) AND t1.f1  >= 0
+ORDER BY t1.f1;
+
+SELECT t1.f1
+FROM t1
+HAVING (3, 2) IN (SELECT 4, 2) AND t1.f1  >= 0
+ORDER BY t1.f1;
+
+SELECT t1.f1
+FROM t1
+HAVING 2 IN (SELECT f2 FROM t2) AND t1.f1  >= 0
+ORDER BY t1.f1;
+
+DROP TABLE t1,t2;
+
+
 --echo End of 5.1 tests

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-04-14 14:35:24 +0000
+++ b/sql/sql_select.cc	2011-04-22 07:20:55 +0000
@@ -2215,7 +2215,7 @@ JOIN::exec()
 
       Item* sort_table_cond= make_cond_for_table(curr_join->tmp_having,
 						 used_tables,
-						 used_tables);
+						 (table_map) 0);
       if (sort_table_cond)
       {
 	if (!curr_table->select)
@@ -12852,6 +12852,42 @@ static bool test_if_ref(Item_field *left
   return 0;					// keep test
 }
 
+/**
+   Extract a condition that can be checked after reading given table
+
+   @param cond       Condition to analyze
+   @param tables     Tables for which "current field values" are available
+   @param used_table Table that we're extracting the condition for (may
+                     also include PSEUDO_TABLE_BITS, and may be zero)
+   @param exclude_expensive_cond  Do not push expensive conditions
+
+   @retval <>NULL Generated condition
+   @retval =NULL  Already checked, OR error
+
+   @details
+     Extract the condition that can be checked after reading the table
+     specified in 'used_table', given that current-field values for tables
+     specified in 'tables' bitmap are available.
+     If 'used_table' is 0
+     - extract conditions for all tables in 'tables'.
+     - extract conditions are unrelated to any tables
+       in the same query block/level(i.e. conditions
+       which have used_tables == 0).
+
+     The function assumes that
+     - Constant parts of the condition has already been checked.
+     - Condition that could be checked for tables in 'tables' has already
+     been checked.
+
+     The function takes into account that some parts of the condition are
+     guaranteed to be true by employed 'ref' access methods (the code that
+     does this is located at the end, search down for "EQ_FUNC").
+
+   @note
+     Make sure to keep the implementations of make_cond_for_table() and
+     make_cond_after_sjm() synchronized.
+     make_cond_for_info_schema() uses similar algorithm as well.
+*/ 
 
 static COND *
 make_cond_for_table(COND *cond, table_map tables, table_map used_table)


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergey.glukhov@stripped\
#   v6fbw8qj20oc236t
# target_branch: file:///home/gluh/MySQL/mysql-5.1/
# testament_sha1: c4c629546f915f7c7cfd246660f9602981d1ae92
# timestamp: 2011-04-22 11:21:00 +0400
# source_branch: bzr+ssh://sgluhov@stripped/bzrroot\
#   /server/mysql-5.1/
# base_revision_id: jon.hauglid@stripped\
#   2f0utgrce31k6so8
# 
# Begin bundle
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
0q9i2Sn+LuSKcKEh1CW7aA==


--===============2656675501413378922==--