diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-03-27 11:34:16 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-03-27 11:34:16 -0400 |
| commit | 3b0c6e65e11c7aef84c7a23e65de4f0e925611a9 (patch) | |
| tree | 833e4df5fcb0619009284efa0831f2782d503e22 /sql/sql_show.cc | |
| parent | bdb9b4483e270fc9d095109ad47615b6b4be62f3 (diff) | |
| parent | 60fb9a03a4e94e651ba459e60bebf38e1de86344 (diff) | |
| download | mariadb-git-3b0c6e65e11c7aef84c7a23e65de4f0e925611a9.tar.gz | |
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
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 286799a44f6..0c9ea7b0bbf 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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))) { |