Skip to content

M
mariadb
Commit 3c331f6b authored by tsmith@maint1.mysql.com's avatar tsmith@maint1.mysql.com
Browse files
Options

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

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
parents a9ae34b5 20956274
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
include/violite.h
View file @ 3c331f6b
...@@ -100,7 +100,9 @@ my_bool vio_poll_read(Vio *vio,uint timeout); ...@@ -100,7 +100,9 @@ my_bool vio_poll_read(Vio *vio,uint timeout);
#define HEADER_DES_LOCL_H dummy_something #define HEADER_DES_LOCL_H dummy_something
#define YASSL_MYSQL_COMPATIBLE #define YASSL_MYSQL_COMPATIBLE
#ifndef YASSL_PREFIX
#define YASSL_PREFIX #define YASSL_PREFIX
#endif
/* Set yaSSL to use same type as MySQL do for socket handles */ /* Set yaSSL to use same type as MySQL do for socket handles */
typedef my_socket YASSL_SOCKET_T; typedef my_socket YASSL_SOCKET_T;
#define YASSL_SOCKET_T_DEFINED #define YASSL_SOCKET_T_DEFINED
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7