database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge ramayana.hindu.god:/home/tsmith/m/bk/50

Browse Source 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
This commit is contained in:
tsmith@ramayana.hindu.god
2007-08-27 18:19:55 -06:00
parent 0670af9479 f9c245611e
commit 86ef148e6c
16 changed files with 855 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_show.cc
View File

@@ -1739,12 +1739,13 @@ static bool show_status_array(THD *thd, const char *wild,
if (thd->net.vio->ssl_arg)
{
char *to= buff;
for (int i=0 ; i++ ;)
char *buff_end= buff + sizeof(buff);
for (int i= 0; to < buff_end; i++)
{
const char *p= SSL_get_cipher_list((SSL*) thd->net.vio->ssl_arg,i);
if (p == NULL)
break;
to= strmov(to, p);
to= strnmov(to, p, buff_end-to-1);
*to++= ':';
}
if (to != buff)