database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2002-09-17 10:50:25 +05:00
parent ca5f6235d3 3444f0426b
commit e0e1110eff
38 changed files with 1874 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_show.cc
View File

@ -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;