bk commit into 5.0 tree (monty:1.1719)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1719 04/12/06 17:16:35 monty@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/sql_show.cc
    1.180 04/12/06 17:16:34 monty@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.54 04/12/06 17:16:34 monty@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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.0/RESYNC

--- 1.179/sql/sql_show.cc	2004-12-06 02:05:24 +02:00
+++ 1.180/sql/sql_show.cc	2004-12-06 17:16:34 +02:00
@@ -2951,10 +2951,12 @@
       }
       break;
     default:
-      if (!(item= new Item_string("", fields_info->field_length, cs)))
+      /* this should be changed when Item_empty_string is fixed(in 4.1) */
+      if (!(item= new Item_empty_string("", 0, cs)))
       {
         DBUG_RETURN(0);
       }
+      item->max_length= fields_info->field_length * cs->mbmaxlen;
       item->set_name(fields_info->field_name,
                      strlen(fields_info->field_name), cs);
       break;