Commit 643ce397 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)
Browse files

Merge pilot.(none):/data/msvensson/mysql/bug30593/my50-bug30593 

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
parents 4fcea0fc e1b9e55a

sql/sql_show.cc

+3 −2
Original line number Diff line number Diff line
@@ -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)