diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-06 20:18:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-06 20:18:40 +0100 |
| commit | 3b267eb6465479c8ac9cdb5a68c4a9ffac68d979 (patch) | |
| tree | 5444defaa15d92468426583b4c930956b1a2057d /sql | |
| parent | 2a1470a0ed4665e4a2602c5905042ac6732c2562 (diff) | |
| download | mariadb-git-3b267eb6465479c8ac9cdb5a68c4a9ffac68d979.tar.gz | |
after-merge fixes for test cases
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 315dc01952b..f6f5845610c 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -984,10 +984,8 @@ static bool check_master_connection(sys_var *self, THD *thd, set_var *var) tmp.str= var->save_result.string_value.str; tmp.length= var->save_result.string_value.length; if (!tmp.str || check_master_connection_name(&tmp)) - { - my_error(ER_WRONG_ARGUMENTS, MYF(0), var->var->name.str); return true; - } + return false; } |