On 2011-03-21 12:52, Dmitry Lenev wrote:
> Hello, Magnus!
>
> * Magnus Blåudd<magnus.blaudd@stripped> [11/03/18 10:05]:
>> thanks for your review. I have one final questions, see below. Once
>> I go that answered, I'll proceed and push this.
>
> ...
>
>>>> === modified file 'sql/sql_show.cc'
>>>> --- a/sql/sql_show.cc 2011-02-08 15:47:33 +0000
>>>> +++ b/sql/sql_show.cc 2011-03-04 08:41:29 +0000
>>>> @@ -1379,17 +1379,24 @@ int store_create_info(THD *thd, TABLE_LI
>>>> if (!(thd->variables.sql_mode&
> MODE_NO_TABLE_OPTIONS)&& !foreign_db_mode)
>>>> {
>>>> show_table_options= TRUE;
>>>> - /*
>>>> - Get possible table space definitions and append them
>>>> - to the CREATE TABLE statement
>>>> - */
>>>>
>>>> - if ((for_str= file->get_tablespace_name(thd,0,0)))
>>>> + /* TABLESPACE and STORAGE */
>>>> + if (share->tablespace ||
>>>> + share->default_storage_media != HA_SM_DEFAULT)
>>>> {
>>>> - packet->append(STRING_WITH_LEN(" /*!50100 TABLESPACE "));
>>>> - packet->append(for_str, strlen(for_str));
>>>> - packet->append(STRING_WITH_LEN(" STORAGE DISK */"));
>>>> - my_free(for_str);
>>>> + packet->append(STRING_WITH_LEN(" /*!50100"));
>>>> + if (share->tablespace)
>>>> + {
>>>> + packet->append(STRING_WITH_LEN(" TABLESPACE "));
>>>> + packet->append(share->tablespace,
> strlen(share->tablespace));
>>>> + }
>>>> +
>>>> + if (share->default_storage_media == HA_SM_DISK)
>>>> + packet->append(STRING_WITH_LEN(" STORAGE DISK"));
>>>> + if (share->default_storage_media == HA_SM_MEMORY)
>>>> + packet->append(STRING_WITH_LEN(" STORAGE MEMORY"));
>>>> +
>>>> + packet->append(STRING_WITH_LEN(" */"));
>>>> }
>>>>
>>>> /*
>>>
>>> Maybe it makes sense to also adjust store_schema_partitions_record()
>>> code so it will no longer use handler::get_tablespace_name()?
>>
>>
>> Yes, I can do that. But since there are then no use of
>> handler::get_tablespace_name(), should I remove that function? My
>> suggestion is to remove it.
>
> I think it is OK to remove this function starting from mysql-trunk.
>
Yes, good idea.
/ Magnus
