diff options
| author | unknown <hf@genie.(none)> | 2002-09-17 10:50:25 +0500 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2002-09-17 10:50:25 +0500 |
| commit | e0e1110efff35cedf43e8c672664bd32ea2268eb (patch) | |
| tree | 2b225ed9a686560fe28e7b286e239706aca350ab /sql/sql_show.cc | |
| parent | ca5f6235d369a398ffa22d25574767a7f1bff774 (diff) | |
| parent | 3444f0426b89f7ff86479e9a0e659bba04108924 (diff) | |
| download | mariadb-git-e0e1110efff35cedf43e8c672664bd32ea2268eb.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/sql_show.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4f1cfa892fc..c69635d20e4 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1394,7 +1394,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; |