diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-04-14 10:04:07 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-14 10:04:07 +0200 |
commit | f57ecb7786177e0af3b1e3ec94302720b2e0f967 (patch) | |
tree | fcbed357c5bcdb373830413086d4f58ff9ba2998 /sql/sql_show.cc | |
parent | 9bfbe7fbce86eab5a8a5de7e401772f058872716 (diff) | |
parent | d364e64ae28c5588ea0ad013738a8dfe18412292 (diff) | |
download | mariadb-git-f57ecb7786177e0af3b1e3ec94302720b2e0f967.tar.gz |
5.5 merge
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index ac71837def4..2717fdb325f 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -7451,20 +7451,20 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list) break; case MYSQL_TYPE_DATE: if (!(item=new Item_return_date_time(fields_info->field_name, - MAX_DATE_WIDTH, + strlen(fields_info->field_name), fields_info->field_type))) DBUG_RETURN(0); break; case MYSQL_TYPE_TIME: if (!(item=new Item_return_date_time(fields_info->field_name, - MAX_TIME_FULL_WIDTH, + strlen(fields_info->field_name), fields_info->field_type))) DBUG_RETURN(0); break; case MYSQL_TYPE_TIMESTAMP: case MYSQL_TYPE_DATETIME: if (!(item=new Item_return_date_time(fields_info->field_name, - MAX_DATETIME_WIDTH, + strlen(fields_info->field_name), fields_info->field_type))) DBUG_RETURN(0); break; |