Commit 6748976d authored by Jan Lindström's avatar Jan Lindström

Fix test failure on rpl_statements test by not listing wsrep variable.

parent bf30585e
......@@ -14,7 +14,6 @@ include/master-slave.inc
show variables like 'binlog_format%';
Variable_name Value
binlog_format MIXED
wsrep_forced_binlog_format NONE
drop table if exists test.marker;
select thread_id into @my_thread_id
from performance_schema.threads
......@@ -59,7 +58,6 @@ Expect 1
show variables like 'binlog_format%';
Variable_name Value
binlog_format MIXED
wsrep_forced_binlog_format NONE
*** Clear statement events
*** Create/drop table, create/drop database
......
......@@ -3275,10 +3275,11 @@ mysql_execute_command(THD *thd)
/* in STATEMENT format, we probably have to replicate also temporary
tables, like mysql replication does
*/
if (WSREP_ON && (!thd->is_current_stmt_binlog_format_row() ||
if (WSREP(thd) && (!thd->is_current_stmt_binlog_format_row() ||
!(create_info.options & HA_LEX_CREATE_TMP_TABLE)))
WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name,
NULL)
{
WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, NULL)
}
#endif /* WITH_WSREP */
/* Regular CREATE TABLE */
res= mysql_create_table(thd, create_table,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment