database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

small cleanups

Browse Source
This commit is contained in:
Sergei Golubchik
2015-02-05 19:18:09 +01:00
parent 41dc186aa8
commit f9448bcb21
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@@ -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'", DBUG_PRINT("enter", ("qtype: %s query: '%-.*s'",
show_query_type(qtype), (int) query_len, query_arg)); show_query_type(qtype), (int) query_len, query_arg));
DBUG_ASSERT(query_arg && DBUG_ASSERT(query_arg);
(WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open())); DBUG_ASSERT(WSREP_EMULATE_BINLOG(this) || mysql_bin_log.is_open());
/* If this is withing a BEGIN ... COMMIT group, don't log it */ /* If this is withing a BEGIN ... COMMIT group, don't log it */
if (variables.option_bits & OPTION_GTID_BEGIN) if (variables.option_bits & OPTION_GTID_BEGIN)

8
sql/sys_vars.cc
View File

@@ -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; tmp.length= var->save_result.string_value.length;
if (!tmp.str || check_master_connection_name(&tmp)) if (!tmp.str || check_master_connection_name(&tmp))
{ {
my_error(ER_WRONG_ARGUMENTS, MYF(ME_JUST_WARNING), my_error(ER_WRONG_ARGUMENTS, MYF(0), var->var->name.str);
var->var->name.str);
return true; return true;
} }
return false; return false;
@@ -4751,11 +4750,12 @@ static bool fix_wsrep_causal_reads(sys_var *self, THD* thd, enum_var_type var_ty
return false; return false;
} }
static Sys_var_mybool Sys_wsrep_causal_reads( 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", "to setting wsrep_sync_wait READ flag",
SESSION_VAR(wsrep_causal_reads), CMD_LINE(OPT_ARG), DEFAULT(FALSE), SESSION_VAR(wsrep_causal_reads), CMD_LINE(OPT_ARG), DEFAULT(FALSE),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), 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( static Sys_var_uint Sys_wsrep_sync_wait(
"wsrep_sync_wait", "Ensure \"synchronous\" read view before executing " "wsrep_sync_wait", "Ensure \"synchronous\" read view before executing "