Commit 3b0c6e65 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27047/my50-prece-bug27047 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


sql/sql_show.cc:
  Auto merged
parents bdb9b448 60fb9a03

sql/sql_show.cc

+9 −0
Original line number Diff line number Diff line
@@ -3602,7 +3602,16 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list) 
        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;

    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)))

      {