summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index e227a5bf5ca..7ac0affbec5 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1391,7 +1391,7 @@ int mysqld_show_charsets(THD *thd, const char *wild)
net_store_data(&packet2,convert,cs->name);
net_store_data(&packet2,(uint32) cs->number);
net_store_data(&packet2,(uint32) cs->strxfrm_multiply);
- net_store_data(&packet2,(uint32) cs->mbmaxlen);
+ net_store_data(&packet2,(uint32) cs->mbmaxlen ? cs->mbmaxlen : 1);
if (my_net_write(&thd->net, (char*) packet2.ptr(),packet2.length()))
goto err;