From: Tor Didriksen
Date: October 19 2010 11:50am
Subject: bzr commit into mysql-trunk-merge branch (tor.didriksen:3278)
List-Archive: http://lists.mysql.com/commits/121118
Message-Id: <20101019115047.E60A337B0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7222858995354246002=="

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

#At file:///export/home/didrik/repo/trunk-merge/ based on revid:magne.mahre@stripped

 3278 Tor Didriksen	2010-10-19 [merge]
      automerge from 5.5-bugteam

    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:29:26 +0000
+++ b/mysql-test/r/select.result	2010-10-19 11:50:12 +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:41:24 +0000
+++ b/sql/field.cc	2010-10-19 11:50:12 +0000
@@ -4203,7 +4203,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)
@@ -4526,7 +4526,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)


--===============7222858995354246002==
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\
#   po81n9dzf59iyb26
# target_branch: file:///export/home/didrik/repo/trunk-merge/
# testament_sha1: 5f90900661074ecea71c3cbd6f07d5b5c01f51b2
# timestamp: 2010-10-19 13:50:47 +0200
# source_branch: file:///export/home/didrik/repo/5.5-bugteam-bug57203/
# base_revision_id: magne.mahre@stripped\
#   fep8a6252k3aefgl
# 
# Begin bundle
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
MOnGPsOQEUxulW7QmU8x7TA/8XckU4UJC5cspaA=


--===============7222858995354246002==--