diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-27 12:00:16 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-27 12:00:16 +0100 |
| commit | 05aba79e981cfeb7e7b68bb31739ab8d443c4aea (patch) | |
| tree | 049beb1e97a6aaa3c755bb2f9f0bf155a1fb4642 /sql/slave.cc | |
| parent | 98c0659150e8d0bc17cfe05361d3c03c64f181c4 (diff) | |
| download | mariadb-git-05aba79e981cfeb7e7b68bb31739ab8d443c4aea.tar.gz | |
MDEV-4447 MariaDB sources should have unix-style line endings everywhere
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 b79e8512f37..f74f5ec6267 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5762,8 +5762,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) |