diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-05 19:18:09 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-05 19:18:39 +0100 |
| commit | f9448bcb2153aac614ecb260a4dd7f27b04f17a2 (patch) | |
| tree | 5776a4144e1ebc0a4b9208fa172791b8316625e3 /sql | |
| parent | 41dc186aa8a5340c78e783a635a95173cc46a697 (diff) | |
| download | mariadb-git-f9448bcb2153aac614ecb260a4dd7f27b04f17a2.tar.gz | |
small cleanups
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 4 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 7e26c77afcd..4a66542b71f 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -6360,8 +6360,8 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query_arg, DBUG_PRINT("enter", ("qtype: %s query: '%-.*s'", show_query_type(qtype), (int) query_len, query_arg)); - DBUG_ASSERT(query_arg && - (WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open())); + DBUG_ASSERT(query_arg); + DBUG_ASSERT(WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open()); /* If this is withing a BEGIN ... COMMIT group, don't log it */ if (variables.option_bits & OPTION_GTID_BEGIN) diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 26d4d7ae04b..cf2eabb5691 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -987,8 +987,7 @@ static bool check_master_connection(sys_var *self, THD *thd, set_var *var) tmp.length= var->save_result.string_value.length; if (!tmp.str || check_master_connection_name(&tmp)) { - my_error(ER_WRONG_ARGUMENTS, MYF(ME_JUST_WARNING), - var->var->name.str); + my_error(ER_WRONG_ARGUMENTS, MYF(0), var->var->name.str); return true; } return false; @@ -4751,11 +4750,12 @@ static bool fix_wsrep_causal_reads(sys_var *self, THD* thd, enum_var_type var_ty return false; } static Sys_var_mybool Sys_wsrep_causal_reads( - "wsrep_causal_reads", "(DEPRECATED) Setting this variable is equivalent " + "wsrep_causal_reads", "Setting this variable is equivalent " "to setting wsrep_sync_wait READ flag", SESSION_VAR(wsrep_causal_reads), CMD_LINE(OPT_ARG), DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_wsrep_causal_reads)); + ON_UPDATE(fix_wsrep_causal_reads), + DEPRECATED("'@@wsrep_sync_wait=1'")); static Sys_var_uint Sys_wsrep_sync_wait( "wsrep_sync_wait", "Ensure \"synchronous\" read view before executing " |