Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310


sql/mysqld.cc:
  Auto merged

BUILD/SETUP.sh

@@ -44,8 +44,8 @@ set -e
 export AM_MAKEFLAGS
 AM_MAKEFLAGS="-j 4"
 
-# SSL library to use. Should be changed to --with-yassl
-SSL_LIBRARY=--with-openssl
+# SSL library to use.
+SSL_LIBRARY=--with-yassl
 
 # If you are not using codefusion add "-Wpointer-arith" to WARNINGS
 # The following warning flag will give too many warnings:

sql/mysqld.cc

@@ -6605,9 +6605,11 @@ static int show_ssl_get_cipher_list(THD *thd, SHOW_VAR *var, char *buff)
   {
     int i;
     const char *p;
-    for (i=0 ; (p= SSL_get_cipher_list((SSL*) thd->net.vio->ssl_arg,i)); i++)
+    char *end= buff + SHOW_VAR_FUNC_BUFF_SIZE;
+    for (i=0; (p= SSL_get_cipher_list((SSL*) thd->net.vio->ssl_arg,i)) &&
+               buff < end; i++)
     {
-      buff= strmov(buff, p);
+      buff= strnmov(buff, p, end-buff-1);
       *buff++= ':';
     }
     if (i)