diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-28 10:00:31 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-28 10:00:31 +0100 |
| commit | 41c760b121494de2c6d58f8c1a600d599ad4e0a5 (patch) | |
| tree | a80a0f7316ffa843437ad24fc0ba7fbd4ee09e14 /sql/slave.cc | |
| parent | 57cdc561fc2b97c3d1d2b318fc0fa2410568c3d6 (diff) | |
| parent | 8d0238a6d8d641939730bdcd1ac4928b2c3c413d (diff) | |
| download | mariadb-git-41c760b121494de2c6d58f8c1a600d599ad4e0a5.tar.gz | |
merge
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index a58ec5e8db1..25480da79a1 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. - Copyright (c) 2008, 2011, Monty Program Ab +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2008, 2014, SkySQL Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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) |