database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

cleanup: simplify the usage of WSREP_FORMAT macro

Browse Source
This commit is contained in:
Sergei Golubchik
2014-10-07 20:28:33 +02:00
parent d103e359f8
commit 8596b70f96
7 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_class.h
View File

@ -3286,8 +3286,7 @@ public:
tests fail and so force them to propagate the
lex->binlog_row_based_if_mixed upwards to the caller.
*/
if ((WSREP_FORMAT((enum enum_binlog_format) variables.binlog_format) ==
BINLOG_FORMAT_MIXED) && (in_sub_stmt == 0))
if ((wsrep_binlog_format() == BINLOG_FORMAT_MIXED) && (in_sub_stmt == 0))
set_current_stmt_binlog_format_row();
DBUG_VOID_RETURN;
@ -3338,8 +3337,7 @@ public:
show_system_thread(system_thread)));
if (in_sub_stmt == 0)
{
if (WSREP_FORMAT((enum enum_binlog_format) variables.binlog_format) ==
BINLOG_FORMAT_ROW)
if (wsrep_binlog_format() == BINLOG_FORMAT_ROW)
set_current_stmt_binlog_format_row();
else if (temporary_tables == NULL)
set_current_stmt_binlog_format_stmt();
@ -3748,6 +3746,11 @@ public:
(rgi_slave && rgi_have_temporary_tables()));
}
inline ulong wsrep_binlog_format() const
{
return WSREP_FORMAT(variables.binlog_format);
}
#ifdef WITH_WSREP
const bool wsrep_applier; /* dedicated slave applier thread */
bool wsrep_applier_closing; /* applier marked to close */