Commit 9cfc25f2 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  SCCS merged
parents e0f5f280 2473c359

mysql-test/t/ssl_des-master.opt

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
--loose_ssl-cert=std_data/server-cert-des.pem --loose_ssl-key=std_data/server-key-des.pem

sql/sql_show.cc

+9 −0
Original line number Diff line number Diff line
@@ -4695,6 +4695,12 @@ 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;

    case MYSQL_TYPE_DECIMAL:

      if (!(item= new Item_decimal((longlong) fields_info->value, false)))

      {
@@ -4711,6 +4717,9 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list) 
                     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)))

      {