database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge dator5.(none):/home/pappa/bug20340

Browse Source 
into  dator5.(none):/home/pappa/bug20733


sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2006-07-22 10:13:47 -04:00
parent 0036ab8c97 aa0ab122cd
commit d8559b3d93
37 changed files with 982 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_show.cc
View File

@ -770,7 +770,14 @@ mysqld_list_fields(THD *thd, TABLE_LIST *table_list, const char *wild)
{
if (!wild || !wild[0] ||
!wild_case_compare(system_charset_info, field->field_name,wild))
field_list.push_back(new Item_field(field));
{
if (table_list->view)
field_list.push_back(new Item_ident_for_show(field,
table_list->view_db.str,
table_list->view_name.str));
else
field_list.push_back(new Item_field(field));
}
}
restore_record(table, s->default_values); // Get empty record
table->use_all_columns();
@ -1345,10 +1352,10 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
packet->append(buff, (uint) (end - buff));
}
table->file->append_create_info(packet);
if (share->comment && share->comment[0])
if (share->comment.length)
{
packet->append(STRING_WITH_LEN(" COMMENT="));
append_unescaped(packet, share->comment, strlen(share->comment));
append_unescaped(packet, share->comment.str, share->comment.length);
}
if (share->connect_string.length)
{
@ -2901,11 +2908,14 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
(uint) (ptr-option_buff)-1), cs);
{
char *comment;
comment= show_table->file->update_table_comment(share->comment);
comment= show_table->file->update_table_comment(share->comment.str);
if (comment)
{
table->field[20]->store(comment, strlen(comment), cs);
if (comment != share->comment)
table->field[20]->store(comment,
(comment == share->comment.str ?
share->comment.length :
strlen(comment)), cs);
if (comment != share->comment.str)
my_free(comment, MYF(0));
}
}