Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51

include/violite.h

@@ -100,7 +100,9 @@ my_bool	vio_poll_read(Vio *vio,uint timeout);
 
 #define HEADER_DES_LOCL_H dummy_something
 #define YASSL_MYSQL_COMPATIBLE
+#ifndef YASSL_PREFIX
 #define YASSL_PREFIX
+#endif
 /* Set yaSSL to use same type as MySQL do for socket handles */
 typedef my_socket YASSL_SOCKET_T;
 #define YASSL_SOCKET_T_DEFINED