From: Tor Didriksen
Date: October 19 2010 6:45am
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3251) Bug#57203
List-Archive: http://lists.mysql.com/commits/121055
X-Bug: 57203
Message-Id: <20101019064524.AE77E37B0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0983251680022207584=="

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

#At file:///export/home/didrik/repo/5.5-bugteam-bug57203/ based on revid:davi.arnaut@stripped

 3251 Tor Didriksen	2010-10-19
      Bug #57203 Assertion `field_length <= 255' failed.
      
      After the fix for
      Bug #55077 Assertion failed: width > 0 && to != ((void *)0), file .\dtoa.c
      we no longer try to allocate a string of length 'field_length'
      so the asserts are relevant only for ZEROFILL columns.
     @ mysql-test/r/select.result
        Add test case for Bug#57203
     @ mysql-test/t/select.test
        Add test case for Bug#57203
     @ sql/field.cc
        Rewrite the DBUG_ASSERTS on field_length.

    modified:
      mysql-test/r/select.result
      mysql-test/t/select.test
      sql/field.cc
=== modified file 'mysql-test/r/select.result'
--- a/mysql-test/r/select.result	2010-09-28 15:15:58 +0000
+++ b/mysql-test/r/select.result	2010-10-19 06:45:18 +0000
@@ -4887,3 +4887,22 @@ col_int_key
 DROP VIEW view_t1;
 DROP TABLE t1;
 # End of test BUG#54515
+#
+# Bug #57203 Assertion `field_length <= 255' failed.
+#
+SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) 
+UNION ALL 
+SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)")))))
+AS foo
+;
+coalesce((avg(distinct (geomfromtext("point(25379 -22010)")))))
+0.0000
+0.0000
+CREATE table t1(a text);
+INSERT INTO t1 VALUES (''), ('');
+SELECT avg(distinct(t1.a)) FROM t1, t1 t2
+GROUP BY t2.a ORDER BY t1.a;
+avg(distinct(t1.a))
+0
+DROP TABLE t1;
+# End of test BUG#57203

=== modified file 'mysql-test/t/select.test'
--- a/mysql-test/t/select.test	2010-09-09 15:00:33 +0000
+++ b/mysql-test/t/select.test	2010-10-19 06:45:18 +0000
@@ -4147,3 +4147,22 @@ DROP VIEW view_t1;
 DROP TABLE t1;
 
 --echo # End of test BUG#54515
+
+--echo #
+--echo # Bug #57203 Assertion `field_length <= 255' failed.
+--echo #
+
+SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) 
+UNION ALL 
+SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)")))))
+AS foo
+;
+
+CREATE table t1(a text);
+INSERT INTO t1 VALUES (''), ('');
+SELECT avg(distinct(t1.a)) FROM t1, t1 t2
+GROUP BY t2.a ORDER BY t1.a;
+
+DROP TABLE t1;
+
+--echo # End of test BUG#57203

=== modified file 'sql/field.cc'
--- a/sql/field.cc	2010-09-29 14:26:32 +0000
+++ b/sql/field.cc	2010-10-19 06:45:18 +0000
@@ -4189,7 +4189,7 @@ String *Field_float::val_str(String *val
 			     String *val_ptr __attribute__((unused)))
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(field_length <= MAX_FIELD_CHARLENGTH);
+  DBUG_ASSERT(!zerofill || field_length <= MAX_FIELD_CHARLENGTH);
   float nr;
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)
@@ -4512,7 +4512,7 @@ String *Field_double::val_str(String *va
 			      String *val_ptr __attribute__((unused)))
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(field_length <= MAX_FIELD_CHARLENGTH);
+  DBUG_ASSERT(!zerofill || field_length <= MAX_FIELD_CHARLENGTH);
   double nr;
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)


--===============0983251680022207584==
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\
#   wd3027xobmdnfv4w
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug57203/
# testament_sha1: 65c91f402896bb3778486f8cdcc716e8dc6cad28
# timestamp: 2010-10-19 08:45:24 +0200
# base_revision_id: davi.arnaut@stripped\
#   ik7p9poh4zdr2xnt
# 
# Begin bundle
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
QsOOZShxGW1W5lcp/phP+LuSKcKEgUT++gA=


--===============0983251680022207584==--