Skip to content

Commit 9f73961

Browse files
author
Yashwant Sahu
committed
WL# 7712: Support SSL by default in libmysql
1 parent e9a47b2 commit 9f73961

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

sql-common/client.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4637,16 +4637,15 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
46374637
MYSQL_TRACE_STAGE(mysql, AUTHENTICATE);
46384638

46394639
#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
4640-
if(mysql->options.protocol != MYSQL_PROTOCOL_MEMORY)
4640+
if(mysql->options.protocol == MYSQL_PROTOCOL_MEMORY)
46414641
{
4642-
#endif
4643-
/* try and bring up SSL if possible */
4644-
cli_calculate_client_flag(mysql, db, client_flag);
4645-
if (cli_establish_ssl(mysql))
4646-
goto error;
4647-
#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
4642+
mysql->options.use_ssl= FALSE;
46484643
}
46494644
#endif
4645+
/* try and bring up SSL if possible */
4646+
cli_calculate_client_flag(mysql, db, client_flag);
4647+
if (cli_establish_ssl(mysql))
4648+
goto error;
46504649

46514650
/*
46524651
Part 2: invoke the plugin to send the authentication data to the server

0 commit comments

Comments
 (0)