diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-21 21:50:43 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-21 21:50:43 -0400 |
| commit | 327409443fa5631b98e65b0c1cce1cfb6e05f723 (patch) | |
| tree | 1994e8151d071ee1228852544e67f38e14c8b16a /sql/slave.cc | |
| parent | fc716dc5a5abd6997310256a1f846e39ea5bf312 (diff) | |
| parent | 5a44e1a4024f1760021e5c6fd65773584d60513a (diff) | |
| download | mariadb-git-327409443fa5631b98e65b0c1cce1cfb6e05f723.tar.gz | |
Merge tag 'mariadb-5.5.44' into 5.5-galera
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index ce4f8b97931..8ecdb484dbf 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4745,8 +4745,8 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi, mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir); /* Set MYSQL_PLUGIN_DIR in case master asks for an external authentication plugin */ - if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)
- mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr);
+ if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr) + mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr); /* we disallow empty users */ if (mi->user == NULL || mi->user[0] == 0) |