From: Tor Didriksen
Date: October 18 2010 7:27am
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3247) Bug#57203
List-Archive: http://lists.mysql.com/commits/120933
X-Bug: 57203
Message-Id: <20101018072748.0F2BE29D7@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2971996962219379439=="

--===============2971996962219379439==
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:li-bing.song@stripped

 3247 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 can be removed.
     @ 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
        Remove 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 07:27:42 +0000
@@ -4887,3 +4887,14 @@ col_int_key
 DROP VIEW view_t1;
 DROP TABLE t1;
 # End of test BUG#54515
+#
+# Bug #57203 Assertion `field_length <= 255' failed.
+#
+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 07:27:42 +0000
@@ -4147,3 +4147,16 @@ DROP VIEW view_t1;
 DROP TABLE t1;
 
 --echo # End of test BUG#54515
+
+--echo #
+--echo # Bug #57203 Assertion `field_length <= 255' failed.
+--echo #
+
+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 07:27:42 +0000
@@ -4189,7 +4189,6 @@ String *Field_float::val_str(String *val
 			     String *val_ptr __attribute__((unused)))
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(field_length <= MAX_FIELD_CHARLENGTH);
   float nr;
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)
@@ -4512,7 +4511,6 @@ String *Field_double::val_str(String *va
 			      String *val_ptr __attribute__((unused)))
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(field_length <= MAX_FIELD_CHARLENGTH);
   double nr;
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)


--===============2971996962219379439==
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\
#   a7xcbr6cc2spnegc
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug57203/
# testament_sha1: 94a266e7730dedb4e7d1ae59d47838ccdeefebd3
# timestamp: 2010-10-18 09:27:47 +0200
# base_revision_id: li-bing.song@stripped\
#   cq65ce5e0pf2szgg
# 
# Begin bundle
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
cKKYheMZGYr3/8XckU4UJDokKZ7A


--===============2971996962219379439==--