summaryrefslogtreecommitdiff
path: root/sql/client_settings.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2016-02-16 12:49:59 +0400
committerSergey Vojtovich <svoj@mariadb.org>2016-02-16 18:40:04 +0400
commite8085d1b4147b43bbed22f2f7befd4f2b2fa178f (patch)
tree0e71ed45f41241513937de32398607ea3f427bf1 /sql/client_settings.h
parent9b73e886fd7578ceb9e7a45247af4c64aad0dbde (diff)
downloadmariadb-git-e8085d1b4147b43bbed22f2f7befd4f2b2fa178f.tar.gz
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.
Diffstat (limited to 'sql/client_settings.h')
-rw-r--r--sql/client_settings.h2
1 files changed, 1 insertions, 1 deletions
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()