summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-09-05 21:55:26 +0500
committerunknown <bar@bar.mysql.r18.ru>2002-09-05 21:55:26 +0500
commitaa4a6df4a0fe9a128f5dd03df9e14ce8649e61c9 (patch)
treec1005f77ed9ced8c64d3fb6489ec074ff43026b2 /sql
parent1895448e66b39542d58a77e705449b92414ff3f7 (diff)
downloadmariadb-git-aa4a6df4a0fe9a128f5dd03df9e14ce8649e61c9.tar.gz
"SHOW CHARACTER SET" now displays 1 for 8bit charsets in "mb_maxlen" column.
0 was dispayed before, this looked confusing.
Diffstat (limited to 'sql')
-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;