From: Martin Hansson
Date: January 12 2011 9:55am
Subject: bzr push into mysql-5.5 branch (martin.hansson:3236 to 3237) Bug#58207
List-Archive: http://lists.mysql.com/commits/128490
X-Bug: 58207
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2017453719=="

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

 3237 Martin Hansson	2011-01-12 [merge]
      Merge of fix for Bug#58207.

    modified:
      mysql-test/r/subselect4.result
      mysql-test/t/subselect4.test
      sql/sql_select.cc
 3236 Dmitry Shulga	2011-01-11 [merge]
      Auto-merge mysql-5.1 -> mysql-5.5 for bug#58887.

    modified:
      sql/net_serv.cc
=== modified file 'mysql-test/r/subselect4.result'
--- a/mysql-test/r/subselect4.result	2010-09-07 10:17:12 +0000
+++ b/mysql-test/r/subselect4.result	2011-01-12 09:31:41 +0000
@@ -164,6 +164,17 @@ a	b
 2	NULL
 DROP TABLE t1, t2, t3, t4, t5;
 #
+# Bug#58207: invalid memory reads when using default column value and 
+# tmptable needed
+#
+CREATE TABLE t(a VARCHAR(245) DEFAULT
+'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+INSERT INTO t VALUES (''),(''),(''),(''),(''),(''),(''),(''),(''),(''),('');
+SELECT * FROM (SELECT default(a) FROM t GROUP BY a) d;
+default(a)
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+DROP TABLE t;
+#
 # End of 5.1 tests.
 #
 #

=== modified file 'mysql-test/t/subselect4.test'
--- a/mysql-test/t/subselect4.test	2010-09-07 10:17:12 +0000
+++ b/mysql-test/t/subselect4.test	2011-01-12 09:31:41 +0000
@@ -136,6 +136,16 @@ SELECT * FROM t1 WHERE NULL NOT IN ( SEL
 
 DROP TABLE t1, t2, t3, t4, t5;
 
+--echo #
+--echo # Bug#58207: invalid memory reads when using default column value and 
+--echo # tmptable needed
+--echo #
+CREATE TABLE t(a VARCHAR(245) DEFAULT
+'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+INSERT INTO t VALUES (''),(''),(''),(''),(''),(''),(''),(''),(''),(''),('');
+SELECT * FROM (SELECT default(a) FROM t GROUP BY a) d;
+DROP TABLE t;
+
 
 --echo #
 --echo # End of 5.1 tests.

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-01-11 11:33:28 +0000
+++ b/sql/sql_select.cc	2011-01-12 09:31:41 +0000
@@ -10042,7 +10042,12 @@ Field *create_tmp_field(THD *thd, TABLE 
                                           convert_blob_length);
     if (orig_type == Item::REF_ITEM && orig_modify)
       ((Item_ref*)orig_item)->set_result_field(result);
-    if (field->field->eq_def(result))
+    /*
+      Fields that are used as arguments to the DEFAULT() function already have
+      their data pointers set to the default value during name resulotion. See
+      Item_default_value::fix_fields.
+    */
+    if (orig_type != Item::DEFAULT_VALUE_ITEM && field->field->eq_def(result))
       *default_field= field->field;
     return result;
   }


--===============2017453719==
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\
#   ay76i8bfo44j3fy5
# target_branch: file:///data0/martin/bzrroot/bug58207/5.5/
# testament_sha1: c8a4f7a2bc43bdd3fab720dd706c6165525dfea7
# timestamp: 2011-01-12 10:55:18 +0100
# source_branch: file:///data0/martin/bzrroot/bug58207/5.1/
# base_revision_id: dmitry.shulga@stripped\
#   jezu2dbglg05g6ff
# 
# Begin bundle
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


--===============2017453719==--