bk commit into 5.1 tree (msvensson:1.2513)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2007-03-28 10:18:35+02:00, msvensson@stripped +5 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2374.96

  mysql-test/r/func_str.result@stripped, 2007-03-28 10:17:54+02:00, msvensson@stripped
+0 -0
    Auto merged
    MERGE: 1.110.1.22

  mysql-test/t/func_str.test@stripped, 2007-03-28 10:17:54+02:00, msvensson@stripped +0
-0
    Auto merged
    MERGE: 1.92.1.12

  sql-common/my_time.c@stripped, 2007-03-28 10:17:54+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.19.1.13

  sql/item_strfunc.cc@stripped, 2007-03-28 10:17:54+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.261.1.38

  sql/sql_show.cc@stripped, 2007-03-28 10:18:33+02:00, msvensson@stripped +0 -0
    SCCS merged
    MERGE: 1.253.1.92

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint/RESYNC

--- 1.400/sql/sql_show.cc	2007-03-19 22:44:15 +01:00
+++ 1.401/sql/sql_show.cc	2007-03-28 10:18:33 +02:00
@@ -4695,6 +4695,12 @@ TABLE *create_schema_table(THD *thd, TAB
         DBUG_RETURN(0);
       }
       break;
+    case MYSQL_TYPE_FLOAT:
+    case MYSQL_TYPE_DOUBLE:
+      if ((item= new Item_float(fields_info->field_name, 0.0, NOT_FIXED_DEC, 
+                           fields_info->field_length)) == NULL)
+        DBUG_RETURN(NULL);
+      break;
     case MYSQL_TYPE_DECIMAL:
       if (!(item= new Item_decimal((longlong) fields_info->value, false)))
       {
@@ -4711,6 +4717,9 @@ TABLE *create_schema_table(THD *thd, TAB
                      strlen(fields_info->field_name), cs);
       break;
     default:
+      /* Don't let unimplemented types pass through. Could be a grave error. */
+      DBUG_ASSERT(fields_info->field_type == MYSQL_TYPE_STRING);
+
       /* this should be changed when Item_empty_string is fixed(in 4.1) */
       if (!(item= new Item_empty_string("", 0, cs)))
       {