bk commit into 4.1 tree (evgen:1.2396)

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen 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.2396 05/08/30 23:29:47 evgen@stripped +2 -0
  manual merge of bug fix#12537

  sql/sql_select.cc
    1.433 05/08/30 23:29:46 evgen@stripped +2 -2
    manual merge

  sql/item.cc
    1.220 05/08/30 23:25:47 evgen@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:	evgen
# Host:	moonbone.local
# Root:	/work/12537-bug-4.1-mysql/RESYNC

--- 1.219/sql/item.cc	2005-08-29 15:47:50 +04:00
+++ 1.220/sql/item.cc	2005-08-30 23:25:47 +04:00
@@ -2047,12 +2047,14 @@
   case MYSQL_TYPE_ENUM:
   case MYSQL_TYPE_SET:
   case MYSQL_TYPE_VAR_STRING:
-    if (max_length > 255)
+    DBUG_ASSERT(collation.collation);
+    if (max_length/collation.collation->mbmaxlen > 255)
       break;					// If blob
     return new Field_varstring(max_length, maybe_null, name, table,
 			       collation.collation);
   case MYSQL_TYPE_STRING:
-    if (max_length > 255)			// If blob
+    DBUG_ASSERT(collation.collation);
+    if (max_length/collation.collation->mbmaxlen > 255)		// If blob
       break;
     return new Field_string(max_length, maybe_null, name, table,
 			    collation.collation);

--- 1.432/sql/sql_select.cc	2005-08-22 15:46:12 +04:00
+++ 1.433/sql/sql_select.cc	2005-08-30 23:29:46 +04:00
@@ -4899,6 +4899,8 @@
 				   item->name, table, item->unsigned_flag);
     break;
   case STRING_RESULT:
+    DBUG_ASSERT(item->collation.collation);
+  
     enum enum_field_types type;
     /*
       DATE/TIME fields have STRING_RESULT result type. To preserve
@@ -4907,7 +4909,7 @@
     if ((type= item->field_type()) == MYSQL_TYPE_DATETIME ||
         type == MYSQL_TYPE_TIME || type == MYSQL_TYPE_DATE)
       new_field= item->tmp_table_field_from_field_type(table);
-    else if (item->max_length > 255)
+    else if (item->max_length/item->collation.collation->mbmaxlen > 255)
     {
       if (convert_blob_length)
         new_field= new Field_varstring(convert_blob_length, maybe_null,