From: Tor Didriksen
Date: October 18 2010 4:37pm
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3250) Bug#57203
List-Archive: http://lists.mysql.com/commits/121006
X-Bug: 57203
Message-Id: <20101018163738.46A7E37B0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6269520854696989276=="

--===============6269520854696989276==
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:dmitry.shulga@stripped

 3250 Tor Didriksen	2010-10-18
      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-18 16:37:32 +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) engine=myisam;
+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-18 16:37:32 +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) engine=myisam;
+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-18 16:37:32 +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)


--===============6269520854696989276==
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\
#   ku27qgyqzqc496mu
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug57203/
# testament_sha1: b66042e5e646bffd6641e9bf875265730b5d38ae
# timestamp: 2010-10-18 18:37:38 +0200
# base_revision_id: dmitry.shulga@stripped\
#   zrpikpxj9aevoczv
# 
# Begin bundle
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


--===============6269520854696989276==--