summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 48d6bc7471f..494607c7fff 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1156,6 +1156,12 @@ store_create_info(THD *thd, TABLE *table, String *packet)
char buff[128];
char* p;
+ if (table->table_charset)
+ {
+ packet->append(" CHARSET=");
+ packet->append(table->table_charset->name);
+ }
+
if (table->min_rows)
{
packet->append(" MIN_ROWS=");
@@ -1386,7 +1392,7 @@ int mysqld_show_charsets(THD *thd, const char *wild)
net_store_data(&packet2,(uint32) cs->mbmaxlen);
if (my_net_write(&thd->net, (char*) packet2.ptr(),packet2.length()))
- goto err; /* purecov: inspected */
+ goto err;
}
}
send_eof(&thd->net);