bk commit into 5.0 tree (bar:1.2039)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2039 06/01/12 11:38:09 bar@stripped +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/field.cc
    1.297 06/01/12 11:37:32 bar@stripped +3 -6
    After merge fix.

  mysql-test/r/ctype_utf8.result
    1.84 06/01/12 11:28:16 bar@stripped +8 -8
    After-merge fix.

  mysql-test/t/ctype_utf8.test
    1.78 06/01/12 11:25:38 bar@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0/RESYNC

--- 1.296/sql/field.cc	2006-01-06 02:49:22 +04:00
+++ 1.297/sql/field.cc	2006-01-12 11:37:32 +04:00
@@ -8981,11 +8981,11 @@
   switch (packlength)
   {
   case 1:
-    return 255;
+    return 255 * field_charset->mbmaxlen;
   case 2:
-    return 65535;
+    return 65535 * field_charset->mbmaxlen;
   case 3:
-    return 16777215;
+    return 16777215 * field_charset->mbmaxlen;
   case 4:
     return (uint32) 4294967295U;
   default:

--- 1.83/mysql-test/r/ctype_utf8.result	2005-11-07 12:32:21 +04:00
+++ 1.84/mysql-test/r/ctype_utf8.result	2006-01-12 11:28:16 +04:00
@@ -1167,3 +1167,11 @@
 execute my_stmt using @a;
 a	b
 drop table if exists t1;
+CREATE TABLE t1 (t TINYTEXT CHARACTER SET utf8);
+INSERT INTO t1 VALUES(REPEAT('a', 100));
+CREATE TEMPORARY TABLE t2 SELECT COALESCE(t) AS bug FROM t1;
+SELECT LENGTH(bug) FROM t2;
+LENGTH(bug)
+100
+DROP TABLE t2;
+DROP TABLE t1;

--- 1.77/mysql-test/t/ctype_utf8.test	2005-11-07 12:32:16 +04:00
+++ 1.78/mysql-test/t/ctype_utf8.test	2006-01-12 11:25:38 +04:00
@@ -868,6 +868,16 @@
 select distinct char(a) from t1;
 drop table t1;
 
+#
+# Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values
+#
+CREATE TABLE t1 (t TINYTEXT CHARACTER SET utf8);
+INSERT INTO t1 VALUES(REPEAT('a', 100));
+CREATE TEMPORARY TABLE t2 SELECT COALESCE(t) AS bug FROM t1;
+SELECT LENGTH(bug) FROM t2;
+DROP TABLE t2;
+DROP TABLE t1;
+
 # End of 4.1 tests
 
 #