From 9b73e886fd7578ceb9e7a45247af4c64aad0dbde Mon Sep 17 00:00:00 2001 From: root Date: Wed, 30 Dec 2015 22:26:25 +0800 Subject: fix-MDEV-9346 --- sql/client_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/client_settings.h') diff --git a/sql/client_settings.h b/sql/client_settings.h index d6a157f71fd..1397c1f1e23 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -37,7 +37,7 @@ CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \ CLIENT_CONNECT_ATTRS) -#define read_user_name(A) {} +#define read_user_name(A) {strmov(A,"");} #undef _CUSTOMCONFIG_ #define mysql_server_init(a,b,c) mysql_client_plugin_init() -- cgit v1.2.1 From e8085d1b4147b43bbed22f2f7befd4f2b2fa178f Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Tue, 16 Feb 2016 12:49:59 +0400 Subject: MDEV-9346 - The federatedx and spider engine make mysqld crash when they are configured withtout username Federated/spider/connect engines or replication threads connecting to other host with empty user name may crash mysqld. This is addition to original patch, which adds a test case and amends a macro. --- sql/client_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/client_settings.h') diff --git a/sql/client_settings.h b/sql/client_settings.h index 1397c1f1e23..f2ad1797b8e 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -37,7 +37,7 @@ CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \ CLIENT_CONNECT_ATTRS) -#define read_user_name(A) {strmov(A,"");} +#define read_user_name(A) A[0]= 0 #undef _CUSTOMCONFIG_ #define mysql_server_init(a,b,c) mysql_client_plugin_init() -- cgit v1.2.1