Merge abarkov@work.mysql.com:/home/bk/mysql-4.1

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.orig

Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.orig
d5875999 · bar@bar.mysql.r18.ru · a6cd4504 · dc8c7afd · d5875999
Commit d5875999 authored Sep 05, 2002 by bar@bar.mysql.r18.ru
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_show.cc sql/sql_show.cc +1 -1

No files found.
--- 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;