From: Tor Didriksen
Date: October 18 2010 1:13pm
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3247) Bug#57203
List-Archive: http://lists.mysql.com/commits/120972
X-Bug: 57203
Message-Id: <20101018131314.93F0829D7@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1429618652001805359=="

--===============1429618652001805359==
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 13:13:09 +0000
@@ -4887,3 +4887,17 @@ col_int_key
 DROP VIEW view_t1;
 DROP TABLE t1;
 # End of test BUG#54515
+#
+# Bug #57203 Assertion `field_length <= 255' failed.
+#
+SELECT avg(distinct(-31872)) as foo;
+foo
+-31872.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 13:13:09 +0000
@@ -4147,3 +4147,18 @@ DROP VIEW view_t1;
 DROP TABLE t1;
 
 --echo # End of test BUG#54515
+
+--echo #
+--echo # Bug #57203 Assertion `field_length <= 255' failed.
+--echo #
+
+SELECT avg(distinct(-31872)) 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 13:13:09 +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)


--===============1429618652001805359==
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\
#   yc1xzzl3rcku6qlv
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug57203/
# testament_sha1: 9ea9c680596db95b1280739a72eafd2c02b0aa48
# timestamp: 2010-10-18 15:13:14 +0200
# base_revision_id: li-bing.song@stripped\
#   cq65ce5e0pf2szgg
# 
# Begin bundle
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
IabcUhw=


--===============1429618652001805359==--