summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-07-25 17:42:20 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-07-25 17:42:20 +0200
commit584d213235704113cf0d70319c0521d93b8744c6 (patch)
tree73f101f28d769546e4f49b9362a4c16bec9516c2 /sql-common
parentae476868a5394041a00e75a29c7d45917e8dfae8 (diff)
parentcc37250a76472de4021bdfb395a17a9e736aecf6 (diff)
downloadmariadb-git-584d213235704113cf0d70319c0521d93b8744c6.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client_plugin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index d1226396446..52e0ae03ee1 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -363,7 +363,7 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
mysql->options.extension->plugin_dir : PLUGINDIR, "/",
name, SO_EXT, NullS);
- if (strpbrk(name, "()[]!@#$%^&/*;.,'?"))
+ if (strpbrk(name, "()[]!@#$%^&/*;.,'?\\"))
{
errmsg= "invalid plugin name";
goto err;