From: Tor Didriksen
Date: October 19 2010 11:51am
Subject: bzr push into mysql-5.5-bugteam branch (tor.didriksen:3253 to 3254) Bug#57203
List-Archive: http://lists.mysql.com/commits/121120
X-Bug: 57203
Message-Id: <20101019115123.ACECE37B0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0021491783211581564=="

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

 3254 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
 3253 Magne Mahre	2010-10-19 [merge]
      Merge from mysql-5.1-bugteam to mysql-5.5-bugteam
      Only test case is merged, as the fix was already
      present in 5.5 code

    added:
      mysql-test/r/lowercase_table4.result
      mysql-test/t/lowercase_table4-master.opt
      mysql-test/t/lowercase_table4.test
=== 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)


--===============0021491783211581564==
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\
#   ty870zhyoyoc3gi8
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug57203/
# testament_sha1: dd78bb4d93453aca47eb734a746b893da67f6229
# timestamp: 2010-10-19 13:51:23 +0200
# base_revision_id: magne.mahre@stripped\
#   u5t3r13fw5e3elfe
# 
# Begin bundle
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


--===============0021491783211581564==--