diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-02 22:07:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-02 22:07:47 +0200 |
| commit | 8e7d6652adda0eaa0ce095b5c2258d5be61487fd (patch) | |
| tree | 96dd8db33b8858ba79c9af8e571698a7f0aab580 /sql/slave.cc | |
| parent | 6bd76f8b7e086ab7cf0249a05277ff552e564554 (diff) | |
| download | mariadb-git-8e7d6652adda0eaa0ce095b5c2258d5be61487fd.tar.gz | |
CRLF->LF
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 a03deb1e793..2fe7ebb575d 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4738,8 +4738,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) |